Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / data-list.sh

diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index 3f821199ff3e2d10f22627e6ce35c93ec7b1f157..52b3dcb8c999c84af08b117352a9b5f13f30f5c3 100755 (executable)
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -151,60 +151,61 @@ $SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from INLINE.
-+--------+------+
-|Variable|Format|
-#========#======#
-|A       |F8.0  |
-|B       |F8.0  |
-|C       |F8.0  |
-|D       |F8.0  |
-+--------+------+
-       A        B        C        D
--------- -------- -------- --------
-    1.00    23.00    45.00     2.03 
-    2.00    22.00    34.00    23.00 
-    3.00    34.00    34.00    34.00 
-       A        B        C        D
--------- -------- -------- --------
-     .       1.00     2.00     3.00 
-     .       4.00      .       5.00 
-    6.00     7.00     8.00     9.00 
-     .00     1.00      .        .   
-     .        .        .        .   
-    2.00     3.00     4.00     5.00 
-       A        B        C        D
--------- -------- -------- --------
-    1.00     2.00     3.00     4.00 
-    1.00     2.00     3.00      .   
-    1.00     2.00      .       4.00 
-    1.00     2.00      .        .   
-    1.00      .       3.00     4.00 
-    1.00      .       3.00      .   
-    1.00      .        .       4.00 
-    1.00      .        .        .   
-     .       2.00     3.00     4.00 
-     .       2.00     3.00      .   
-     .       2.00      .       4.00 
-     .       2.00      .        .   
-     .        .       3.00     4.00 
-     .        .       3.00      .   
-     .        .        .       4.00 
-     .        .        .        .   
-               start                  end count
--------------------- -------------------- -----
-          07/22/2007           10/06/2007   321
-          07/14/1789           08/26/1789     4
-          01/01/1972           12/31/1999   682
-x y
-- -
-1 2
-3 4
-5 6
-7 8
-9 0
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+A,F8.0
+B,F8.0
+C,F8.0
+D,F8.0
+
+Table: Data List
+A,B,C,D
+1.00,23.00,45.00,2.03
+2.00,22.00,34.00,23.00
+3.00,34.00,34.00,34.00
+
+Table: Data List
+A,B,C,D
+.  ,1.00,2.00,3.00
+.  ,4.00,.  ,5.00
+6.00,7.00,8.00,9.00
+.00,1.00,.  ,.  
+.  ,.  ,.  ,.  
+2.00,3.00,4.00,5.00
+
+Table: Data List
+A,B,C,D
+1.00,2.00,3.00,4.00
+1.00,2.00,3.00,.  
+1.00,2.00,.  ,4.00
+1.00,2.00,.  ,.  
+1.00,.  ,3.00,4.00
+1.00,.  ,3.00,.  
+1.00,.  ,.  ,4.00
+1.00,.  ,.  ,.  
+.  ,2.00,3.00,4.00
+.  ,2.00,3.00,.  
+.  ,2.00,.  ,4.00
+.  ,2.00,.  ,.  
+.  ,.  ,3.00,4.00
+.  ,.  ,3.00,.  
+.  ,.  ,.  ,4.00
+.  ,.  ,.  ,.  
+
+Table: Data List
+start,end,count
+07/22/2007,10/06/2007,321
+07/14/1789,08/26/1789,4
+01/01/1972,12/31/1999,682
+
+Table: Data List
+x,y
+1,2
+3,4
+5,6
+7,8
+9,0
 EOF
 if [ $? -ne 0 ] ; then fail ; fi