Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / command / sysfiles.sh

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 48f561bc795ece3b881e9c85343e2a78d75c2a8f..08b28888e267a237465cde420b85b9b0edc465d9 100755 (executable)
--- 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,22 +83,21 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -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 
-
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+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