Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / loop.sh

diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index 813777f4acea547542e62ce827faecb439877bac..21d883e8ff312454a6a495dd4ba3c1f3e23c070a 100755 (executable)
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -141,82 +141,155 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list  - <<EOF
+diff -c $TEMPDIR/pspp.csv  - <<EOF
 Loop with index
-    1.00 
-    2.00 
+
+1.00 
+
+2.00 
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
-    3.00 
-    6.00 
-    9.00 
+
+3.00 
+
+6.00 
+
+9.00 
+
 --------
+
 --------
+
 Loop with IF condition
-    1.00 
-    2.00 
+
+1.00 
+
+2.00 
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
-    3.00 
-    6.00 
-    9.00 
+
+3.00 
+
+6.00 
+
+9.00 
+
 --------
+
 --------
+
 Loop with END IF condition
-    1.00 
-    2.00 
+
+1.00 
+
+2.00 
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
-    3.00 
-    6.00 
-    9.00 
+
+3.00 
+
+6.00 
+
+9.00 
+
 --------
-    4.00 
+
+4.00 
+
 --------
+
 Loop with index and IF condition based on index
-    1.00 
-    2.00 
+
+1.00 
+
+2.00 
+
 --------
-    2.00 
+
+2.00 
+
 --------
-    3.00 
+
+3.00 
+
 --------
+
 --------
+
 Loop with index and END IF condition based on index
-    1.00 
-    2.00 
+
+1.00 
+
+2.00 
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
-    3.00 
-    6.00 
+
+3.00 
+
+6.00 
+
 --------
+
 --------
+
 Loop with index and IF and END IF condition based on index
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
+
 --------
+
 --------
+
 Loop with no conditions
-    1.00 
+
+1.00 
+
 --------
-    2.00 
-    4.00 
+
+2.00 
+
+4.00 
+
 --------
-    3.00 
-    6.00 
+
+3.00 
+
+6.00 
+
 --------
-    4.00 
+
+4.00 
+
 --------
 EOF
 if [ $? -ne 0 ] ; then fail ; fi