X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fdo-repeat.sh;h=f5999dc7978332a7d48f562a2bcd3491dc720b76;hb=refs%2Fbuilds%2F20100607040503%2Fpspp;hp=0a702633c120c070897a37ab812347484ff160e1;hpb=c1629e9b28338e59f9e4c027f3792a9419840a2c;p=pspp

diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh
index 0a702633c1..f5999dc797 100755
--- a/tests/command/do-repeat.sh
+++ b/tests/command/do-repeat.sh
@@ -9,7 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -60,7 +64,7 @@ BEGIN DATA.
 0
 END DATA.
 
-DO REPEAT h = h0 TO h3 / x = 0 TO 3 / y = 8, 7, 6, 5.
+DO REPEAT h = h0 TO h3 / x = 0 TO 3 / y = 8, 7.5, 6, 5.
 	COMPUTE h = x + y.
 END REPEAT.
 
@@ -80,15 +84,15 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE 
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - <<EOF
-a       h0       h1       h2       h3       v1       v2       v3       v4       v5       v6
-- -------- -------- -------- -------- -------- -------- -------- -------- -------- --------
-0     8.00     8.00     8.00     8.00     4.00     5.00     6.00     5.00     6.00     7.00 
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv
+diff -b  $TEMPDIR/pspp.csv - <<EOF
+Table: Data List
+a,h0,h1,h2,h3,v1,v2,v3,v4,v5,v6
+0,8.00,8.50,8.00,8.00,4.00,5.00,6.00,5.00,6.00,7.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi