X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Ffilter.sh;h=40729c85ed7b8e896c8bad817e724c9c93e58d53;hb=e8f3c723e255ca91fe94512a809762223e6edcc3;hp=0745d932063af32a086fa5cd8e57b977ad906f10;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git

diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index 0745d932..40729c85 100755
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -5,10 +5,14 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -16,6 +20,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -77,12 +82,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 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"
-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 
@@ -90,7 +96,6 @@ diff -B -b $TEMPDIR/pspp.list - << EOF
  5     1.00 
  7     1.00 
  9     1.00 
-
  X FILTER_$
 -- --------
  1     1.00 
@@ -103,7 +108,6 @@ diff -B -b $TEMPDIR/pspp.list - << EOF
  8      .00 
  9     1.00 
 10      .00 
-
  X FILTER_$
 -- --------
  2     1.00 
@@ -111,7 +115,6 @@ diff -B -b $TEMPDIR/pspp.list - << EOF
  6     1.00 
  8     1.00 
 10     1.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi