X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Fepoch.sh;h=dcbfc0ac4e0d59d650abd12a077db7ed8d562cd4;hb=f51ecb48027e6b1eb46840ae25888a25b429f012;hp=b8d88fa9f810ac6e00a153da6c28253dfaa24025;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh index b8d88fa9f8..dcbfc0ac4e 100755 --- a/tests/expressions/epoch.sh +++ b/tests/expressions/epoch.sh @@ -9,6 +9,7 @@ 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 @@ -17,6 +18,10 @@ export STAT_CONFIG_PATH cleanup() { + if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then + echo "NOT cleaning $TEMPDIR" + return ; + fi cd / rm -rf $TEMPDIR } @@ -137,7 +142,7 @@ EOF if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $top_builddir/src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out +$SUPERVISOR $PSPP --testing-mode -o pspp.csv $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out activity="compare results" perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out