X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfiles.sh;h=d4f59052de98b9d5e99820a2dce6beffbe221a89;hb=ee46f6404b033f4d1312c6b52a207ec2da99d94b;hp=48f561bc795ece3b881e9c85343e2a78d75c2a8f;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 48f561bc..d4f59052 100755
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -7,10 +7,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
@@ -18,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -75,11 +83,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 variable001 variable002 variable003 variable004
 ----------- ----------- ----------- -----------
        1.00        1.00        1.00        2.00  
@@ -90,7 +99,6 @@ variable001 variable002 variable003 variable004
        2.00        1.00        2.00   	  22.00 
        2.00        2.00        1.00   	   1.00 
        2.00        2.00        2.00   	   3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi