X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ffilter.sh;h=ec76fba9f099c08157cd123ec647a01df6c8450d;hb=ebbfbe937906e4b4ca577478965cf06d1a812715;hp=151e43f27b03497a48c98b89b4e031ccad42a187;hpb=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp-builds.git

diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index 151e43f2..ec76fba9 100755
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -5,16 +5,26 @@
 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
-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()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -47,8 +57,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/filter.stat << EOF
-data list notable /x 1-2.
+cat > $TESTFILE << EOF
+data list notable /X 1-2.
 begin data.
 1
 2
@@ -61,7 +71,7 @@ begin data.
 9
 10
 end data.
-compute filter_$ = mod(x,2).
+compute FILTER_$ = mod(x,2).
 
 filter by filter_$.
 list.
@@ -76,12 +86,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 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 
@@ -89,7 +100,6 @@ diff -B -b $TEMPDIR/pspp.list - << EOF
  5     1.00 
  7     1.00 
  9     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 
-
  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 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi