X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fsysfiles.sh;h=2bfd6a5b03163a3f8ae86752531694c2d7e5a4fd;hb=2da08e801be698df268f35ac6e21cc8a345ba1fb;hp=e16d1612a41d10b81d3385fd04a0868e79907353;hpb=ed7bce25787929340a3f264f00dde7c979e571a9;p=pspp-builds.git

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index e16d1612..2bfd6a5b 100755
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -7,16 +7,22 @@
 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -73,22 +79,22 @@ 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
-VARIABLE VARIAB_A VARIAB_B VARIAB_C
--------- -------- -------- --------
-    1.00     1.00     1.00     2.00 
-    1.00     1.00     2.00    30.00 
-    1.00     2.00     1.00     8.00 
-    1.00     2.00     2.00    20.00 
-    2.00     1.00     1.00     2.00 
-    2.00     1.00     2.00    22.00 
-    2.00     2.00     1.00     1.00 
-    2.00     2.00     2.00     3.00 
-
+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  
+       1.00        1.00        2.00       30.00 
+       1.00        2.00        1.00   	   8.00 
+       1.00        2.00        2.00   	  20.00 
+       2.00        1.00        1.00   	   2.00 
+       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