Merged changes from branch interaction-review

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

diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 8a210d02633a80c681f83afb141691c59f4ace05..4f4515e2be05073a21a85232970a2bdbe77b5069 100755 (executable)
--- a/tests/command/sample.sh
+++ b/tests/command/sample.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 [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii --testing-mode $TEMPDIR/sample.stat 
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/sample.stat 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create head"