X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcrosstabs.sh;h=3ef691f376b672facb32463112c4ac9d86337f74;hb=64322c8ee0af7bf5ecc825ccc90513118732f335;hp=4bd6e47e0014e55695f5b01c283b2365958b0760;hpb=8a4b898e180ce7bd8f8d4dbff006c4ada07b0c21;p=pspp-builds.git

diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 4bd6e47e..3ef691f3 100755
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.sh
@@ -3,17 +3,28 @@
 # This program tests for a bug which crashed pspp when doing a crosstabs
 
 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
 }
 
@@ -73,7 +84,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$here/../src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi