Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / do-repeat.sh

diff --git a/tests/command/do-repeat.sh b/tests/command/do-repeat.sh
index 452814fa182a6f3a417cf599c3f562ce09912b42..07d67ec978148340f4d4fd2fa4022bcf35ba789c 100755 (executable)
--- 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
 }
@@ -60,15 +64,15 @@ BEGIN DATA.
 0
 END DATA.
 
-DO REPEAT h = h0 TO h3 / x = 0 1 2 3 / y = 8 TO 5.
+DO REPEAT h = h0 TO h3 / x = 0 TO 3 / y = 8, 7.5, 6, 5.
        COMPUTE h = x + y.
 END REPEAT.
 
 VECTOR v(6).
 COMPUTE #idx = 0.
-DO REPEAT a = 1 TO 2.
-       DO REPEAT b = 3 TO 5.
-               COMPUTE #x = a + b.
+DO REPEAT i = 1 TO 2.
+       DO REPEAT j = 3 TO 5.
+               COMPUTE #x = i + j.
                COMPUTE #idx = #idx + 1.
                COMPUTE v(#idx) = #x.
        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 >/dev/null 2>&1
+$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.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