X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ferase.sh;h=20fe9276495d79fcd2fe5fe1ed7126b49a5b0528;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=8b06c42c8f62bf348bee3e55a0b6ee2b0ef7a1ee;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp

diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index 8b06c42c8f..20fe927649 100755
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -9,7 +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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -20,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
 }
@@ -77,7 +81,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$SUPERVISOR $PSPP $TESTFILE > /dev/null
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -eq 0 ] ; then fail ; fi
 
 
@@ -90,8 +94,8 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="run prog 1"
-$SUPERVISOR $PSPP $TESTFILE
+activity="run prog 2"
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 # foobar should now be gone