Greatly simplify PSPP configuration.

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

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 44273ece20fd3832ef1f96d8ad335de10354ac9d..a0b806e5e0f6453f55bad717a3a644b9acf5da50 100755 (executable)
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -37,6 +37,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -101,7 +105,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
+$SUPERVISOR $PSPP -o pspp.csv --error-file=$TEMPDIR/errs $TEMPDIR/print.stat 
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare print.out"
@@ -155,32 +159,56 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
-diff $TEMPDIR/pspp.list - << EOF
+diff $TEMPDIR/pspp.csv - << EOF
 1 2 
 
+
+
 12
+
 1 -2 
 
+
+
 3 4 
 
+
+
 34
+
 3 -4 
 
+
+
 . 6 
 
+
+
 .6
+
 . -6 
 
+
+
 7 . 
 
+
+
 7.
+
 7 -. 
 
+
+
 9 0 
 
+
+
 90
+
 9 -0 
 
+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi