X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fagg_crash.sh;h=449e90e949856a489e939cf1900308d3b177ad47;hb=5f222ad4739550128ce5502b158763bba53bf9bb;hp=30d63be106bd5f4a8c8c859e29b8a76859b28847;hpb=3caec9acde088184ec125733b3bdfd7e1cd019a8;p=pspp

diff --git a/tests/bugs/agg_crash.sh b/tests/bugs/agg_crash.sh
index 30d63be106..449e90e949 100755
--- a/tests/bugs/agg_crash.sh
+++ b/tests/bugs/agg_crash.sh
@@ -6,16 +6,26 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -51,8 +61,8 @@ activity="create program"
 cat > $TESTFILE <<EOF
 INPUT PROGRAM.
 LOOP c=1 TO 20.
-COMPUTE x=UNIFORM(10)
-END CASE.
+  COMPUTE x=UNIFORM(10)
+  END CASE.
 END LOOP.
 END FILE.
 END INPUT PROGRAM.
@@ -66,7 +76,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 # So this will have a non zero error status.
 # But it shouldn't crash!
 activity="run_program"
-$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi