Greatly simplify PSPP configuration.

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

diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index 0599bed315e666cafc21b71650d4996d753a25f0..4276661442bb1f2111f3f8b893bbffbe0620aa19 100755 (executable)
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -77,7 +81,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -eq 0 ] ; then fail ; fi
 
 
@@ -91,7 +95,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog 2"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone