X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fdo-repeat.sh;h=07d67ec978148340f4d4fd2fa4022bcf35ba789c;hb=refs%2Ftags%2Fsid-i386-build141;hp=62000de630f3b02b3e1bd7ef3803e4289039b056;hpb=d13a6e0157824a5dc125080295e86b5215d3a29d;p=pspp-builds.git

diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh
index 62000de6..07d67ec9 100755
--- a/tests/command/do-repeat.sh
+++ b/tests/command/do-repeat.sh
@@ -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
 }
@@ -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 --testing-mode $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.50     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