X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest_template;h=5c996621ebd3130db798823dd2540fa9f147f6ee;hb=41c45ec6bc320abc0eed650ed183b604a5f5befd;hp=664549cdf3b9cf1df9c6e04eb756b46e339f767e;hpb=c1edead52e3b254bc305afd1d647b94bd10ca5d4;p=pspp-builds.git

diff --git a/tests/test_template b/tests/test_template
index 664549cd..5c996621 100755
--- a/tests/test_template
+++ b/tests/test_template
@@ -3,17 +3,29 @@
 # This program tests ....
 
 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
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+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
      rm -rf $TEMPDIR
 }
 
@@ -46,10 +58,15 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 put test set up here ...
+if [ $? -ne 0 ] ; then no_result ; fi
 
+
+activity="run program"
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
+
 put test here
 
 if [ $? -ne 0 ] ; then fail ; fi