X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fval-labs.sh;h=4d57f661e79511acfb522e2ddd2f0590a91814d4;hb=38d5e09c01ddffc98430c3c55ed3ccb821180cbf;hp=0858c9c1bbf11c46549158fe9cba3a1150d540e5;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh index 0858c9c1..4d57f661 100755 --- a/tests/bugs/val-labs.sh +++ b/tests/bugs/val-labs.sh @@ -11,6 +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 # ensure that top_srcdir is absolute top_srcdir=`cd $top_srcdir; pwd` @@ -21,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 } @@ -72,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi #Invalid syntax --- return value is non zero. activity="run program" -$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null +$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE if [ $? -ne 1 ] ; then fail ; fi pass;