X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ferase.sh;h=4276661442bb1f2111f3f8b893bbffbe0620aa19;hb=f51ecb48027e6b1eb46840ae25888a25b429f012;hp=64d63a8e056604447f3c064d144c2fd9da36d320;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp-builds.git

diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index 64d63a8e..42766614 100755
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -5,10 +5,14 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -16,6 +20,11 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -72,7 +81,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -eq 0 ] ; then fail ; fi
 
 
@@ -85,8 +94,8 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="run prog 1"
-$SUPERVISOR $here/../src/pspp $TESTFILE
+activity="run prog 2"
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone