Greatly simplify PSPP configuration.

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

diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index 651c8cc69d310ddc964462750341f9a33dc489d4..4276661442bb1f2111f3f8b893bbffbe0620aa19 100755 (executable)
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -9,6 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
 top_srcdir=`cd $top_srcdir; pwd`
@@ -19,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
 }
@@ -76,7 +81,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -eq 0 ] ; then fail ; fi
 
 
@@ -89,8 +94,8 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="run prog 1"
-$SUPERVISOR $top_builddir/src/pspp $TESTFILE
+activity="run prog 2"
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone