Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / bugs / curtailed.sh

diff --git a/tests/bugs/curtailed.sh b/tests/bugs/curtailed.sh
index c0f59294614e998c1de50e38829990332dc2b6a3..624f5a5ba69da7f8fade089dc597ee68be2a8bb6 100755 (executable)
--- a/tests/bugs/curtailed.sh
+++ b/tests/bugs/curtailed.sh
@@ -10,6 +10,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`
@@ -20,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -69,7 +74,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 #This must fail
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE
 if [ $? -ne 1 ] ; then fail ; fi