Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / bugs / val-labs.sh

diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh
index b27683b6c21f1e11844d91727047c7c0f7cfbe7e..1f07ca6d37adc88cab27c0fbea2b2ab90f6832c1 100755 (executable)
--- a/tests/bugs/val-labs.sh
+++ b/tests/bugs/val-labs.sh
@@ -22,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
 }
@@ -73,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 #Invalid syntax --- return value is non zero.
 activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE 
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi
 
 pass;