X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbugs%2Fval-labs.sh;h=7fd457b970693bea9e8bb6559fd6b8326921ee6d;hb=c83f5c5360ea8b67ae4fd81c35ae606724aa0da9;hp=b27683b6c21f1e11844d91727047c7c0f7cfbe7e;hpb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;p=pspp-builds.git

diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh
index b27683b6..7fd457b9 100755
--- a/tests/bugs/val-labs.sh
+++ b/tests/bugs/val-labs.sh
@@ -11,7 +11,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`
@@ -22,6 +22,10 @@ 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 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 #Invalid syntax --- return value is non zero.
 activity="run program"
-$SUPERVISOR $PSPP -o raw-ascii -e /dev/null $TESTFILE 
+$SUPERVISOR $PSPP -o pspp.csv -e /dev/null $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi
 
 pass;