Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / input-program.sh

diff --git a/tests/command/input-program.sh b/tests/command/input-program.sh
index a6e8c7784a2c1666793fe934fcd02eb58c808bc6..4aa5ebd260c4d43a799b59a47fbee63266119bc7 100755 (executable)
--- a/tests/command/input-program.sh
+++ b/tests/command/input-program.sh
@@ -91,13 +91,12 @@ $SUPERVISOR $PSPP --testing-mode test1.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test1 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-         X          Y
----------- ----------
-         1          4
-         2          5
-         3          6
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+X,Y
+1,4
+2,5
+3,6
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -126,15 +125,15 @@ $SUPERVISOR $PSPP --testing-mode test2.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test2 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-         X          Y
----------- ----------
-         1          4
-         2          5
-         3          6
-         .          7
-         .          8
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+X,Y
+1,4
+2,5
+3,6
+.,7
+.,8
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -166,18 +165,18 @@ $SUPERVISOR $PSPP --testing-mode test3.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test3 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-         X
-----------
-         1
-         2
-         3
-         4
-         5
-         6
-         7
-         8
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+X
+1
+2
+3
+4
+5
+6
+7
+8
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -212,18 +211,18 @@ $SUPERVISOR $PSPP --testing-mode test4.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test4 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-         X
-----------
-         1
-         2
-         3
-         4
-         5
-         6
-         7
-         8
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+X
+1
+2
+3
+4
+5
+6
+7
+8
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -249,60 +248,60 @@ $SUPERVISOR $PSPP --testing-mode test5.pspp
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare test5 results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-Case#        X
------ --------
-    1     3.00
-    2     6.00
-    3     9.00
-    4    12.00
-    5    15.00
-    6    18.00
-    7    21.00
-    8    24.00
-    9    27.00
-   10    30.00
-   11    33.00
-   12    36.00
-   13    39.00
-   14    42.00
-   15    45.00
-   16    48.00
-   17    51.00
-   18    54.00
-   19    57.00
-   20    60.00
-   21    63.00
-   22    66.00
-   23    69.00
-   24    72.00
-   25    75.00
-   26    78.00
-   27    81.00
-   28    84.00
-   29    87.00
-   30    90.00
-   31    93.00
-   32    96.00
-   33    99.00
-   34   102.00
-   35   105.00
-   36   108.00
-   37   111.00
-   38   114.00
-   39   117.00
-   40   120.00
-   41   123.00
-   42   126.00
-   43   129.00
-   44   132.00
-   45   135.00
-   46   138.00
-   47   141.00
-   48   144.00
-   49   147.00
-   50   150.00
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.csv
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+Case Number,X
+1,3.00
+2,6.00
+3,9.00
+4,12.00
+5,15.00
+6,18.00
+7,21.00
+8,24.00
+9,27.00
+10,30.00
+11,33.00
+12,36.00
+13,39.00
+14,42.00
+15,45.00
+16,48.00
+17,51.00
+18,54.00
+19,57.00
+20,60.00
+21,63.00
+22,66.00
+23,69.00
+24,72.00
+25,75.00
+26,78.00
+27,81.00
+28,84.00
+29,87.00
+30,90.00
+31,93.00
+32,96.00
+33,99.00
+34,102.00
+35,105.00
+36,108.00
+37,111.00
+38,114.00
+39,117.00
+40,120.00
+41,123.00
+42,126.00
+43,129.00
+44,132.00
+45,135.00
+46,138.00
+47,141.00
+48,144.00
+49,147.00
+50,150.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi