X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest_template;h=572e46e4dae5b12899bb76cb7899a6a7d2bb4de2;hb=a27e454d1a65872d0b1147f320ba8cc42aa9275f;hp=a0f70b05405bc8bb7c591dd1f5ed9e11b2a208a7;hpb=4d5ed89b7cdcb9dc2ea761cef3f04df3d2599436;p=pspp

diff --git a/tests/test_template b/tests/test_template
index a0f70b0540..572e46e4da 100755
--- a/tests/test_template
+++ b/tests/test_template
@@ -5,12 +5,19 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_srcdir and top_builddir  are absolute
+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`
 
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+LANG=C
+export LANG
 
 
 cleanup()
@@ -55,7 +62,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi