Add scratch file handles.

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

diff --git a/tests/command/print.sh b/tests/command/print.sh
index ca34602344b5e41dd38251a1883db1f2dda7a79a..a4783bbcb5ee2bcbedc44194532b41aadd078653 100755 (executable)
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -98,8 +98,9 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from file $TEMPDIR/data-list.data.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from "$TEMPDIR/data-list.data".
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -108,8 +109,7 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
-2.1 PRINT.  Writing 1 record(s) to file foo.
+2.1 PRINT.  Writing 1 record to "foo".
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -120,17 +120,12 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 |C       |     1| 19- 28|N10.0 |
 |"/"     |     1| 29- 29|A1    |
 +--------+------+-------+------+
-
-
        A        B        C        D
 -------- -------- -------- --------
      .       2.00     3.00     4.00 
-
      .       6.00     7.00     8.00 
-
      .      10.00    11.00    12.00 
-
-3.1 DATA LIST.  Reading free-form data from file $TEMPDIR/data-list.data.
+3.1 DATA LIST.  Reading free-form data from "$TEMPDIR/data-list.data".
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -139,8 +134,7 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
-4.1 PRINT.  Writing 1 record(s) to the listing file.
+4.1 PRINT.  Writing 1 record.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -150,7 +144,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 |D       |     1| 28- 35|F8.2  |
 +--------+------+-------+------+
      .       2.00     3.00     4.00 
-
        A        B        C        D
 -------- -------- -------- --------
      .       2.00     3.00     4.00 
@@ -164,7 +157,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
    10.00    11.00      .        .   
    12.00      .        .        .   
    12.00      .        .        .   
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi