projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Use "base" color for background in GUI output window.
[pspp]
/
tests
/
command
/
filter.sh
diff --git
a/tests/command/filter.sh
b/tests/command/filter.sh
index 905d21aeaf785b97dd53f5fada95a858b5393bb2..ec76fba9f099c08157cd123ec647a01df6c8450d 100755
(executable)
--- a/
tests/command/filter.sh
+++ b/
tests/command/filter.sh
@@
-5,16
+5,26
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
-here=`pwd`;
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+58,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE << EOF
activity="create program"
cat > $TESTFILE << EOF
-data list notable /
x
1-2.
+data list notable /
X
1-2.
begin data.
1
2
begin data.
1
2
@@
-61,7
+71,7
@@
begin data.
9
10
end data.
9
10
end data.
-compute
filter
_$ = mod(x,2).
+compute
FILTER
_$ = mod(x,2).
filter by filter_$.
list.
filter by filter_$.
list.
@@
-76,12
+86,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="check results"
-diff -B -b $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
X FILTER_$
-- --------
1 1.00
X FILTER_$
-- --------
1 1.00
@@
-89,7
+100,6
@@
diff -B -b $TEMPDIR/pspp.list - << EOF
5 1.00
7 1.00
9 1.00
5 1.00
7 1.00
9 1.00
-
X FILTER_$
-- --------
1 1.00
X FILTER_$
-- --------
1 1.00
@@
-102,7
+112,6
@@
diff -B -b $TEMPDIR/pspp.list - << EOF
8 .00
9 1.00
10 .00
8 .00
9 1.00
10 .00
-
X FILTER_$
-- --------
2 1.00
X FILTER_$
-- --------
2 1.00
@@
-110,7
+119,6
@@
diff -B -b $TEMPDIR/pspp.list - << EOF
6 1.00
8 1.00
10 1.00
6 1.00
8 1.00
10 1.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi