X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fstats%2Fmoments.sh;h=a0a72c6365022facedf0fb52d7ff363a37d9743b;hb=48e0129f54424a6fd5fb1bc7651e48dedc5293c2;hp=efee8ae10c41cecdf3d1e50fc040791e24373513;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh
index efee8ae1..a0a72c63 100755
--- a/tests/stats/moments.sh
+++ b/tests/stats/moments.sh
@@ -8,6 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$
 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$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -18,9 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
@@ -80,7 +84,7 @@ sed < $TEMPDIR/moments-list-2p >> $TEMPDIR/moments-2p.stat \
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run two-pass program"
-$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \
+$SUPERVISOR $PSPP --testing-mode -o pspp.csv \
 	 $TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out
 
 activity="compare two-pass output"
@@ -94,7 +98,7 @@ sed < $TEMPDIR/moments-list-1p >> $TEMPDIR/moments-1p.stat \
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run one-pass program"
-$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii \
+$SUPERVISOR $PSPP --testing-mode -o pspp.csv \
 	 $TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out
 
 activity="compare one-pass output"