X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfiles.sh;h=7e0dcafcaf9ce950133aa62ecfd0437283bb3fc8;hb=f774ff348c7abdf13424219e9c41d5e11943202b;hp=b504cdec06128517d33fec8dfb6410bf5b09d641;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index b504cdec..7e0dcafc 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,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -74,11 +79,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $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  
@@ -89,7 +95,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