X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fvariables.sh;h=c4a2d5d46e5908aabd05e5fc3da29f1e61d419c6;hb=e59bf0b7b753079089d6bc4b13798216b2cb6809;hp=fe174b4138a22295ae87f4e859907ec1378503aa;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh
index fe174b41..c4a2d5d4 100755
--- a/tests/expressions/variables.sh
+++ b/tests/expressions/variables.sh
@@ -9,13 +9,20 @@ if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -94,7 +101,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/variables.stat > $TEMPDIR/variables.err 2> $TEMPDIR/variables.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"