Fixed blank replacement

diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 2ebdc6c758af1340d40968b393a70611350e05da..b9f6e50d6ecd299a0fbf02b4dd29f6083fd92f3a 100755 (executable)
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -82,7 +82,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test output"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -90,7 +90,6 @@ diff -b $TEMPDIR/pspp.list - <<EOF |perl -e 's/^\s*$//g'
 |X       |     1|  1-  5|A5    |
 |Y       |     1|  7-  7|F1.0  |
 +--------+------+-------+------+
-
     X Y        A        B
 ----- - -------- --------
 lasdj 1     1.00     3.00 
@@ -102,7 +101,6 @@ asdfj 9     4.00     1.00
 lajks 9     2.00     1.00 
 asdfk 0     3.00     4.00 
 asdfk 1     3.00     3.00 
-
     X Y        A        B        Z        W
 ----- - -------- -------- -------- --------
 lasdj 1     1.00     3.00      .00     1.00 

diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index 4c6ee92d3edf4c53e754d58ca4bbf0c79f1505f3..2d328b76f7ee33ad43836b5424a828ec928d15da 100755 (executable)
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -81,7 +81,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - << foobar |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/pspp.list - << foobar
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -89,7 +89,6 @@ diff -b $TEMPDIR/pspp.list - << foobar |perl -e 's/^\s*$//g'
 |A       |     1|  1-  1|F1.0  |
 |B       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 A B
 - -
 1 2 
@@ -97,7 +96,6 @@ A B
 5 6 
 7 8 
 9 0 
-
 2.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -105,7 +103,6 @@ A B
 |A       |     1|  1-  1|F1.0  |
 |B       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 A B
 - -
 0 9 

diff --git a/tests/command/count.sh b/tests/command/count.sh
index 351d636fdef0b5ede2ef5e0f658a082d11bd7422..7c4d19a68952e4322a05d883d7b37fe317d54060 100755 (executable)
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -73,8 +73,8 @@ 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -82,7 +82,6 @@ diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |V1      |     1|  1-  2|A2    |
 |V2      |     1|  3-  4|A2    |
 +--------+------+-------+------+
-
 V1 V2        C
 -- -- --------
 12 34      .00 

diff --git a/tests/command/data-list.sh b/tests/command/data-list.sh
index 99b94aa5b15e7829a1069421b5654f873d7d9565..de5281ec0e9074eafd893e7f2650f44752b59ec3 100755 (executable)
--- a/tests/command/data-list.sh
+++ b/tests/command/data-list.sh
@@ -106,8 +106,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TESTFI
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -117,13 +117,11 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |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 
@@ -132,7 +130,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
      .00     1.00      .        .   
      .        .        .        .   
     2.00     3.00     4.00     5.00 
-
        A        B        C        D
 -------- -------- -------- --------
     1.00     2.00     3.00     4.00 

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index afecfa56cd7e57cad414ecd4935d0d23ac3c1e34..538d0897f7b79ca67a261745e888f04a40e4f3f4 100755 (executable)
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -89,8 +89,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 EXAMINE.  Case Processing Summary
 #==#===============================#
 #  #             Cases             #
@@ -101,7 +101,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #==#==#=======#=#=======#==#=======#
 #V1#23|   100%|0|     0%|23|   100%#
 #==#==#=======#=#=======#==#=======#
-
 1.2 EXAMINE.  Extreme Values
 #==========#===========#=====#
 #          #Case Number|Value#
@@ -120,7 +119,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #         5#          3| 3.00#
 #         6#          5| 4.00#
 #==========#===========#=====#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index 21b88a04b942a666c13f34259238030250357dc3..7a0e773c1e6f1dca6f1229072b6511b69d2388e7 100755 (executable)
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -82,15 +82,14 @@ 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
 #========#======#
 |X       |F8.0  |
 +--------+------+
-
 2.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -101,7 +100,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 2.2 EXAMINE.  Percentiles
 #================#================================#
 #                #             Percentiles        #
@@ -111,7 +109,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #X|HAverage      #.40|.80|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
 #=#==============#===#===#====#====#====#====#====#
-
 3.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -122,7 +119,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 3.2 EXAMINE.  Percentiles
 #==================#================================#
 #                  #             Percentiles        #
@@ -132,7 +128,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #X|Weighted Average#.30|.60|1.50|3.50|5.75|7.10|7.55#
 # |Tukey's Hinges  #   |   |3.50|5.00|6.50|    |    #
 #=#================#===#===#====#====#====#====#====#
-
 4.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -143,7 +138,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 4.2 EXAMINE.  Percentiles
 #================#================================#
 #                #             Percentiles        #
@@ -153,7 +147,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #X|Rounded       #.00|.00|2.00|5.00|5.00|8.00|8.00#
 # |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
 #=#==============#===#===#====#====#====#====#====#
-
 5.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -164,7 +157,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 5.2 EXAMINE.  Percentiles
 #================#==================================#
 #                #              Percentiles         #
@@ -174,7 +166,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #X|Empirical     #2.00|2.00|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges#    |    |3.50|5.00|6.50|    |    #
 #=#==============#====#====#====#====#====#====#====#
-
 6.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -185,7 +176,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 6.2 EXAMINE.  Percentiles
 #==========================#==================================#
 #                          #              Percentiles         #
@@ -195,7 +185,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #X|Empirical with averaging#2.00|2.00|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges          #    |    |3.50|5.00|6.50|    |    #
 #=#========================#====#====#====#====#====#====#====#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/examine.sh b/tests/command/examine.sh
index 1136267f8c2c141393b0697ef161af5ae1d0e73d..079ee5994deeb026bcc702576e1c6b45d602b79c 100755 (executable)
--- a/tests/command/examine.sh
+++ b/tests/command/examine.sh
@@ -94,8 +94,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 # NOTE:  In the following data: Only the extreme values have been checked
 # The descriptives have been blindly pasted.
 activity="compare results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -104,7 +104,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |W       |F8.0  |
 |BRAND   |F8.0  |
 +--------+------+
-
 Case#  QUALITY        W    BRAND
 ----- -------- -------- --------
     1     3.00     1.00     1.00 
@@ -123,7 +122,6 @@ Case#  QUALITY        W    BRAND
    14     5.00     3.00     3.00 
    15     3.00     1.00     3.00 
    16     6.00     1.00     3.00 
-
 2.1 EXAMINE.  Case Processing Summary
 #===============#===============================#
 #               #             Cases             #
@@ -134,7 +132,6 @@ Case#  QUALITY        W    BRAND
 #===============#==#=======#=#=======#==#=======#
 #Breaking Strain#24|   100%|0|     0%|24|   100%#
 #===============#==#=======#=#=======#==#=======#
-
 2.2 EXAMINE.  Extreme Values
 #=======================#===========#=====#
 #                       #Case Number|Value#
@@ -147,7 +144,6 @@ Case#  QUALITY        W    BRAND
 #                      2#          3| 1.00#
 #                      3#          3| 1.00#
 #=======================#===========#=====#
-
 2.3 EXAMINE.  Descriptives
 #==========================================================#=========#==========#
 #                                                          #Statistic|Std. Error#
@@ -166,7 +162,6 @@ Case#  QUALITY        W    BRAND
 #               Skewness                                   #   .059  |   .472   #
 #               Kurtosis                                   #  -.358  |   .918   #
 #==========================================================#=========#==========#
-
 2.4 EXAMINE.  Case Processing Summary
 #===========================#=============================#
 #                           #            Cases            #
@@ -179,7 +174,6 @@ Case#  QUALITY        W    BRAND
 #               Bloggs      #8|   100%|0|     0%|8|   100%#
 #               Charlies    #8|   100%|0|     0%|8|   100%#
 #===========================#=#=======#=#=======#=#=======#
-
 2.5 EXAMINE.  Extreme Values
 #===================================#===========#=====#
 #               Manufacturer        #Case Number|Value#
@@ -208,7 +202,6 @@ Case#  QUALITY        W    BRAND
 #                                  2#         13| 4.00#
 #                                  3#         13| 4.00#
 #===================================#===========#=====#
-
 2.6 EXAMINE.  Descriptives
 #======================================================================#=========#==========#
 #               Manufacturer                                           #Statistic|Std. Error#
@@ -255,7 +248,6 @@ Case#  QUALITY        W    BRAND
 #                           Skewness                                   #   .304  |   .752   #
 #                           Kurtosis                                   #   .146  |   1.481  #
 #======================================================================#=========#==========#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 839990944250d67f133beb652dce4e3f9e2b92d7..be5a80473b08ce677141b95d3fe489c68c38b83b 100755 (executable)
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -116,8 +116,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.filtered - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.filtered
+diff -b  $TEMPDIR/pspp.filtered - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -125,41 +125,28 @@ diff -b  $TEMPDIR/pspp.filtered - <<EOF | perl -e 's/^\s*$//g'
 |X       |     1|  1-  1|F1.0  |
 |Y       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
-
 File label:
 This is a test file label
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
-
 File label:
 This is a test file label
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
- 
    There should be another document now.
-
 Documents in the active file:
-
    First line of a document
    This is the second very long line of a document in an attempt to overflow the
    Note that the last line should end with a period: .
- 
    There should be another document now.
-
 File label:
 This is a test file label
 EOF

diff --git a/tests/command/filter.sh b/tests/command/filter.sh
index b6ab48f046e202f58522152443873e1c5e3fa6ea..3edee7579cbfb6e16a8f9c324de5d7427a3bbe81 100755 (executable)
--- a/tests/command/filter.sh
+++ b/tests/command/filter.sh
@@ -83,8 +83,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="check results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - << EOF
  X FILTER_$
 -- --------
  1     1.00 
@@ -92,7 +92,6 @@ diff  -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
  5     1.00 
  7     1.00 
  9     1.00 
-
  X FILTER_$
 -- --------
  1     1.00 
@@ -105,7 +104,6 @@ diff  -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
  8      .00 
  9     1.00 
 10      .00 
-
  X FILTER_$
 -- --------
  2     1.00 
@@ -113,7 +111,6 @@ diff  -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
  6     1.00 
  8     1.00 
 10     1.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/flip.sh b/tests/command/flip.sh
index f4eb926fefd916dc47f4819a00efab8af8a11904..9448e21f4b830bceb3f60bd65746af4a8f361434 100755 (executable)
--- a/tests/command/flip.sh
+++ b/tests/command/flip.sh
@@ -72,8 +72,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/flip.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -84,7 +84,6 @@ diff  -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |     1|  6-  7|F2.0  |
 |D       |     1|  8-  9|F2.0  |
 +--------+------+-------+------+
-
 N  A  B  C  D
 - -- -- -- --
 v  1  2  3  4 
@@ -92,14 +91,12 @@ w  6  7  8  9
 x 11 12 13 14 
 y 16 17 18 19 
 z 21 22 23 24 
-
 CASE_LBL        V        W        X        Y        Z
 -------- -------- -------- -------- -------- --------
 A            1.00     6.00    11.00    16.00    21.00 
 B            2.00     7.00    12.00    17.00    22.00 
 C            3.00     8.00    13.00    18.00    23.00 
 D            4.00     9.00    14.00    19.00    24.00 
-
 CASE_LBL        A        B        C        D
 -------- -------- -------- -------- --------
 V            1.00     2.00     3.00     4.00 

diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
index de8a147d558c0ef9b46860c4cf6ff74959468b0a..342bc8b0452c126574e244913c459e63812b2d24 100755 (executable)
--- a/tests/command/import-export.sh
+++ b/tests/command/import-export.sh
@@ -70,8 +70,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
        X        Y
 -------- --------
     1.00     2.00 

diff --git a/tests/command/lag.sh b/tests/command/lag.sh
index 70d46e95606540c9a98cea51df1c319cbd8a315d..01fbc59276292ce4a23e184386f407fb42b91cb1 100755 (executable)
--- a/tests/command/lag.sh
+++ b/tests/command/lag.sh
@@ -71,15 +71,14 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/lag.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare result"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |W       |     1|  1-  1|F1.0  |
 +--------+------+-------+------+
-
 W        X        Y        Z
 - -------- -------- --------
 1      .        .        .   

diff --git a/tests/command/list.sh b/tests/command/list.sh
index 58098ebfe67235e8b1001d1e0a99f5f5abb7329c..80be418af34e83a7edef8a80240c483fec799e92 100755 (executable)
--- a/tests/command/list.sh
+++ b/tests/command/list.sh
@@ -73,8 +73,8 @@ 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from file $top_srcdir/tests/weighting.data.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -82,7 +82,6 @@ diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |AVAR    |     1|  1-  5|F5.0  |
 |BVAR    |     1|  6- 10|F5.0  |
 +--------+------+-------+------+
-
  AVAR  BVAR
 ----- -----
    18     1 
@@ -137,7 +136,6 @@ diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
    79     1 
    80     1 
    94     1 
-
 Case#  AVAR  BVAR
 ----- ----- -----
     1    18     1 
@@ -192,7 +190,6 @@ Case#  AVAR  BVAR
    50    79     1 
    51    80     1 
    52    94     1 
-
 X000 X001 X002 X003 X004 X005 X006 X007 X008 X009 X010 X011 X012 X013 X014 X015 X016 X017 X018 X019 X020 X021 X022 X023 X024 X025 X026 X027 X028 X029 X030
 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
    7    6    7    5    3    2    4    6    6    3    4    8    5    1    3    7    8    9    0    7    3    4    8    3    1    0    6    4    0    9    1 
@@ -220,7 +217,6 @@ X000 X001 X002 X003 X004 X005 X006 X007 X008 X009 X010 X011 X012 X013 X014 X015
    6    9    4    9    9    7    3    7    9    7    9    9    0    9    5    6    2    9    1    0    7    2    1    5    8    1    2    3    8    8    7 
    1    3    9    6    2    8    5    9    9    6    5    3    5    4    8    9    4    4    0    8    1    6    1    2    4    7    0    0    6    8    2 
    0    7    0    0    4    8    9    5    2    4    3    5    8    2    0    8    3    5    8    6    9    7    3    4    9    4    5    0    0    3    6 
-
 X000 X001 X002 X003 X004 X005 X006 X007 X008 X009 X010 X011 X012 X013 X014 X015 X016 X017 X018 X019 X020 X021 X022 X023 X024 X025 X026 X027 X028 X029 X030 X031 X032 X033 X034 X035 X036 X037 X038 X039 X040 X041 X042 X043 X044 X045 X046 X047 X048 X049 X050 X051 X052 X053 X054 X055 X056 X057 X058 X059 X060 X061 X062 X063 X064 X065 X066 X067 X068 X069 X070 X071 X072 X073 X074 X075 X076 X077 X078 X079 X080 X081 X082 X083 X084 X085 X086 X087 X088 X089 X090 X091 X092 X093 X094 X095 X096 X097 X098 X099 X100 X101 X102 X103 X104 X105 X106 X107 X108 X109 X110 X111 X112 X113 X114 X115 X116 X117 X118 X119 X120 X121 X122 X123 X124 X125 X126
 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
    7    6    7    5    3    2    4    6    6    3    4    8    5    1    3    7    8    9    0    7    3    4    8    3    1    0    6    4    0    9    1    7    5    8    5    9    2    9    5    8    4    2    8    1    5    2    9    5    1    1    3    7    5    3    2    6    5    9    4    1    8    7    5    2    3    3    8    1    5    7    6    7    5    3    2    4    6    6    3    4    8    5    1    3    7    8    9    0    7    3    4    8    3    1    0    6    4    0    9    1    7    5    8    5    9    2    9    5    8    4    2    8    1    5    2    9    5    1    1    3    7    5    3    2    6    5    8 

diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh
index 8571ab5b71a0392897b048f2a1e2de659a0a6701..54dbcfa4fa5e65ce6d865a351c562bd4af6693b5 100755 (executable)
--- a/tests/command/longvars.sh
+++ b/tests/command/longvars.sh
@@ -71,8 +71,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------------+------+
 |   Variable   |Format|
@@ -82,11 +82,9 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |X             |F8.0  |
 |Yabbadabbadoo |F8.0  |
 +--------------+------+
-
 AlphaBetaGamma        B        X Yabbadabbadoo
 -------------- -------- -------- -------------
           2.00     3.00     4.00          5.00 
-
 2.1 CROSSTABS.  Summary.
 #===============#=====================================================#
 #               #                        Cases                        #
@@ -98,7 +96,6 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #X *            #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #Yabbadabbadoo  #        |        |        |        |        |        #
 #===============#========#========#========#========#========#========#
-
 2.2 CROSSTABS.  X by Yabbadabbadoo [count].
 #===============#==============================================================#========#
 #               #                         Yabbadabbadoo                        |        #
@@ -114,7 +111,6 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #           7.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
 #Total          #     .0%|     .0%|     .0%|     .0%|    1.0%|     .0%|     .0%|    1.0%#
 #===============#========#========#========#========#========#========#========#========#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index e1f7ef096ef4193a6b837ee1352af1c63e5f71fb..1e76c6da1887be3545589a650ebf5663e6e09864 100755 (executable)
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -71,14 +71,14 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare stdout"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/stdout
-diff -b $TEMPDIR/stdout  - <<EOF |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/stdout  - <<EOF
 $TEMPDIR/loop.stat:10: warning: BREAK: BREAK not enclosed in DO IF structure.
 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list  - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +----------+------+-------+------+
 | Variable |Record|Columns|Format|

diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh
index 7864921f72d1208075422900440631495e7deef3..78e7f31801d9555593dd4286285a342fdc61ee1d 100755 (executable)
--- a/tests/command/match-files.sh
+++ b/tests/command/match-files.sh
@@ -191,7 +191,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check $name output"
 perl -pi -e 's/^\s*$//g' pspp.list
-diff -b -w - pspp.list <<EOF |perl -e 's/^\s*$//g'
+diff -b -w - pspp.list <<EOF
 A B C D E F
 - - - - - -
 0 a A 1 b N

diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh
index 5323b875a3c64d88cb141341e3b684bd9d6eddbd..a8ff7e21c512eeb71190d55a2682b96b2caf61de 100755 (executable)
--- a/tests/command/no_case_size.sh
+++ b/tests/command/no_case_size.sh
@@ -69,7 +69,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
 perl -pi -e 's/^\s*$//g' pspp.list
-diff -b -w pspp.list - <<EOF |perl -e 's/^\s*$//g'
+diff -b -w pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
@@ -86,7 +86,6 @@ diff -b -w pspp.list - <<EOF |perl -e 's/^\s*$//g'
 |COUNT   |number of countries                        |       4|
 |        |Format: F8.2                               |        |
 +--------+-------------------------------------------+--------+
-
                             CONT     SIZE      POP    COUNT
 -------------------------------- -------- -------- --------
 Asia                             44579000 3.67E+09    44.00 
@@ -96,7 +95,6 @@ South America                    17819000 3.42E+08    12.00
 Antarctica                       13209000      .00      .00 
 Europe                            9938000 7.32E+08    46.00 
 Australia/Oceania                 7687000 31000000    14.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index 5de916748dcc3df0e52af83a40d54e083ffc5d02..a15775b557f8ac38b20d53e65f85a3fc950941c4 100755 (executable)
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -92,8 +92,8 @@ activity="run program"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -101,7 +101,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |QUALITY |F8.0  |
 |BRAND   |F8.0  |
 +--------+------+
-
 2.1 ONEWAY.  Descriptives
 #===============#========#==#====#==============#==========#=======================#=======#=======#
 #               |        #  |    |              |          |    95% Confidence     |       |       #
@@ -113,14 +112,12 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #               |Charlies# 5|5.00|          1.58|       .71|       3.04|       6.96|   3.00|   7.00#
 #               |Total   #15|3.47|          1.77|       .46|       2.49|       4.45|   1.00|   7.00#
 #===============#========#==#====#==============#==========#===========#===========#=======#=======#
-
 2.2 ONEWAY.  Test of Homogeneity of Variances
 #===============#================#===#===#============#
 #               #Levene Statistic|df1|df2|Significance#
 #===============#================#===#===#============#
 #Breaking Strain#            .092|  2| 12|        .913#
 #===============#================#===#===#============#
-
 2.3 ONEWAY.  ANOVA
 #==============================#==============#==#===========#=====#============#
 #                              #Sum of Squares|df|Mean Square|  F  |Significance#
@@ -129,7 +126,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #               |Within Groups #         23.60|12|      1.967|     |            #
 #               |Total         #         43.73|14|           |     |            #
 #===============#==============#==============#==#===========#=====#============#
-
 2.4 ONEWAY.  Contrast Coefficients
 #==========#=======================#
 #          #      Manufacturer     #
@@ -139,7 +135,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #Contrast|1#     -2|     1|       1#
 #        |2#      0|    -1|       1#
 #========#=#=======#======#========#
-
 2.5 ONEWAY.  Contrast Tests
 #===============================================#=================#==========#=====#=====#===============#
 #                                       Contrast#Value of Contrast|Std. Error|  t  |  df |Sig. (2-tailed)#
@@ -149,7 +144,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #               |Does not assume equal |    1   #             3.80|     1.483|2.562|8.740|           .031#
 #               |                      |    2   #             1.80|      .917|1.964|7.720|           .086#
 #===============#======================#========#=================#==========#=====#=====#===============#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 1f135d9bb7ca6ebc2d0e546dd3f738c00e56219c..78c6212fcfa5ae19f5b7d074e04191573667f391 100755 (executable)
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -98,8 +98,8 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from file $TEMPDIR/data-list.data.
 +--------+------+
 |Variable|Format|
@@ -109,7 +109,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
 2.1 PRINT.  Writing 1 record(s) to file foo.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -121,16 +120,11 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |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.
 +--------+------+
 |Variable|Format|
@@ -140,7 +134,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
 4.1 PRINT.  Writing 1 record(s) to the listing file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -151,7 +144,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |D       |     1| 28- 35|F8.2  |
 +--------+------+-------+------+
      .       2.00     3.00     4.00 
-
        A        B        C        D
 -------- -------- -------- --------
      .       2.00     3.00     4.00 
@@ -165,7 +157,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
    10.00    11.00      .        .   
    12.00      .        .        .   
    12.00      .        .        .   
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index 2c43d3a7f2c2a6463fb94f98fec174e4ad96fa51..e65e545bad96f49349b96ce9fbfe390f1734d4e0 100755 (executable)
--- a/tests/command/rename.sh
+++ b/tests/command/rename.sh
@@ -78,8 +78,8 @@ grep -i Brake $TEMPDIR/rename.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +----------+------+
 | Variable |Format|
@@ -87,21 +87,18 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |brakeFluid|F8.0  |
 |y         |F8.0  |
 +----------+------+
-
 brakeFluid        y
 ---------- --------
       1.00     3.00 
       2.00     3.00 
       3.00     3.00 
       4.00     3.00 
-
 applecarts        y
 ---------- --------
       1.00     3.00 
       2.00     3.00 
       3.00     3.00 
       4.00     3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/sample.sh b/tests/command/sample.sh
index 099df5f25b5898777e3b0a84c88b47250a1a6ef8..793379958bed8149aa248aacc3de0e16bbee7424 100755 (executable)
--- a/tests/command/sample.sh
+++ b/tests/command/sample.sh
@@ -87,7 +87,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare head"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/head
-diff -b $TEMPDIR/head - << EOF |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/head - << EOF
  A
 --
 EOF

diff --git a/tests/command/split-file.sh b/tests/command/split-file.sh
index 7a992a16af6fbd421e430665c707f57e4ea7f71e..bc75db497339bcd3cf5d497766ee7259a065def9 100755 (executable)
--- a/tests/command/split-file.sh
+++ b/tests/command/split-file.sh
@@ -78,11 +78,10 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/split.stat
 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 Variable Value Label
 X            1
-
 X Y
 - -
 1 2 
@@ -91,10 +90,8 @@ X Y
 1 9 
 1 5 
 1 4 
-
 Variable Value Label
 X            2
-
 X Y
 - -
 2 7 

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 34acd488fe4afc77b83cc14e0a8d0e6987e4f27b..34269c586b8b3d56988f422c1b7e71974923d462 100755 (executable)
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -77,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/out-filtered
-diff -b -w $TEMPDIR/out-filtered - << EOF |perl -e 's/^\s*$//g'
+diff -b -w $TEMPDIR/out-filtered - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -85,7 +85,6 @@ diff -b -w $TEMPDIR/out-filtered - << EOF |perl -e 's/^\s*$//g'
 |x       |F8.0  |
 |name    |A10   |
 +--------+------+
-
 2.1 SYSFILE INFO.  
 File:      pro.sav
 Label:     No label.
@@ -94,7 +93,6 @@ Cases:     3
 Type:      System File.
 Weight:    Not weighted.
 Mode:      Compression off.
-
 +--------+-------------+---+
 |Variable|Description  |Pos|
 |        |             |iti|
@@ -104,7 +102,6 @@ Mode:      Compression off.
 +--------+-------------+---+
 |name    |Format: A10  |  2|
 +--------+-------------+---+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/sysfiles-old.sh b/tests/command/sysfiles-old.sh
index c1cc5ea9288bbe350e9f0cac734e548424f5f171..5d7483922d8f2bf13a9ffa74afe5ed900cbc05de 100755 (executable)
--- a/tests/command/sysfiles-old.sh
+++ b/tests/command/sysfiles-old.sh
@@ -89,8 +89,8 @@ grep  'X=X' $TEMPDIR/foo.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-perl -pi -e 's/^\s*\$//g' $TEMPDIR/pspp.list
-diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
        X VARIABLE VARIAB_A VARIAB_B
 -------- -------- -------- --------
     1.00     1.00     1.00     2.00 
@@ -101,7 +101,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
     2.00     1.00     2.00    22.00 
     2.00     2.00     1.00     1.00 
     2.00     2.00     2.00     3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 4dca4eaaf18437e760df74cf936ba13bc31d237c..1ec5718c22342c66d78768bc942e03655644ff3d 100755 (executable)
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -79,8 +79,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e 's/^\s*\$//g' $TEMPDIR/pspp.list
-diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF
 variable001 variable002 variable003 variable004
 ----------- ----------- ----------- -----------
        1.00        1.00        1.00        2.00  
@@ -91,7 +91,6 @@ variable001 variable002 variable003 variable004
        2.00        1.00        2.00      22.00 
        2.00        2.00        1.00       1.00 
        2.00        2.00        2.00       3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index 01582f21c7b3b4474c56aa82d2628d066f0929ce..db41de932e9b0b5196e4040c4e810d858cfedb43 100755 (executable)
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -87,8 +87,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -96,7 +96,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |INDEP   |F8.0  |
 |DEP     |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Group Statistics
 #===========#==#====#==============#========#
 #     INDEP | N|Mean|Std. Deviation|SE. Mean#
@@ -104,7 +103,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 #DEP < 1.514|11|8.00|         2.864|    .863#
 #    >=1.514|11|9.00|         3.821|   1.152#
 #===========#==#====#==============#========#
-
 2.2 T-TEST.  Independent Samples Test
 #==============================#=========#===============================================================================#
 #                              #Levene's |                          t-test for Equality of Means                         #

diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index 488cf20a81a64b42af8b831d9889c52e4c79900f..77bf4bc6d16ddc6523fbb9334c26271960c7633f 100755 (executable)
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -70,8 +70,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -79,14 +79,12 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |ID      |F8.0  |
 |ABC     |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  One-Sample Statistics
 #===#=#====#==============#========#
 #   #N|Mean|Std. Deviation|SE. Mean#
 #===#=#====#==============#========#
 #ABC#6|3.00|           .84|    .342#
 #===#=#====#==============#========#
-
 2.2 T-TEST.  One-Sample Test
 #===#=====================================================#
 #   #                Test Value = 2.000000                #

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 7932b707c8882719b9b59fef0530d668f98b27aa..34ac15e938377acc38af4f1482913b5f6dbc8f97 100755 (executable)
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -69,8 +69,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -79,7 +79,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |A       |F8.0  |
 |B       |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Paired Sample Statistics
 #========#====#=#==============#========#
 #        #Mean|N|Std. Deviation|SE. Mean#
@@ -87,14 +86,12 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 #Pair 0 A#2.00|5|          .707|    .316#
 #       B#4.00|5|         1.541|    .689#
 #========#====#=#==============#========#
-
 2.2 T-TEST.  Paired Samples Correlations
 #======#=====#=#===========#====#
 #      |     #N|Correlation|Sig.#
 #======#=====#=#===========#====#
 #Pair 0|A & B#5|       .918|.028#
 #======#=====#=#===========#====#
-
 2.3 T-TEST.  Paired Samples Test
 #===========#=====================================================#======#==#===============#
 #           #                  Paired Differences                 |      |  |               #

diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 1fc45c70e3948583bdef95c8b9128f794ccefac0..0d65db5ef03e81dda3f76b984f8224868fdee23b 100755 (executable)
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -75,8 +75,8 @@ 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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -84,7 +84,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |X       |F8.0  |
 |C       |F8.0  |
 +--------+------+
-
 2.1 EXAMINE.  Case Processing Summary
 #=#===============================#
 # #             Cases             #
@@ -95,7 +94,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #=#==#=======#=#=======#==#=======#
 #X#52|   100%|0|     0%|52|   100%#
 #=#==#=======#=#=======#==#=======#
-
 2.2 EXAMINE.  Descriptives
 #============================================#=========#==========#
 #                                            #Statistic|Std. Error#
@@ -114,7 +112,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 # Skewness                                   #  1.194  |   .330   #
 # Kurtosis                                   #  15.732 |   .650   #
 #============================================#=========#==========#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 

diff --git a/tests/command/use.sh b/tests/command/use.sh
index 415314d62f3424009493bd0e065badad0dec78ba..7874ea3f06a4cd65cbe5fb3681321bf274212b56 100755 (executable)
--- a/tests/command/use.sh
+++ b/tests/command/use.sh
@@ -76,8 +76,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="check results"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - << EOF
  X
 --
  1

diff --git a/tests/command/weight.sh b/tests/command/weight.sh
index 44995fc1b68404587605ab9c3265d4add48c34b8..7dd31a372f80d13a84e99d00d2a3561ec9ca362a 100755 (executable)
--- a/tests/command/weight.sh
+++ b/tests/command/weight.sh
@@ -66,8 +66,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $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 | perl -e 's/^\s*$//g'
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from file $top_srcdir/tests/weighting.data.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
@@ -75,14 +75,12 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |AVAR    |     1|  1-  5|F5.0  |
 |BVAR    |     1|  6- 10|F5.0  |
 +--------+------+-------+------+
-
 2.1 DESCRIPTIVES.  Valid cases = 730; cases with missing value(s) = 0.
 +--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
 |Variable#Valid N|Missing N| Mean |S E Mean|Std Dev|Variance|Kurtosis|S E Kurt|Skewness|S E Skew| Range|Minimum|Maximum|   Sum   |
 #========#=======#=========#======#========#=======#========#========#========#========#========#======#=======#=======#=========#
 |AVAR    #    730|        0|31.515|    .405| 10.937| 119.608|   2.411|    .181|   1.345|    .090|76.000| 18.000| 94.000|23006.000|
 +--------#-------+---------+------+--------+-------+--------+--------+--------+--------+--------+------+-------+-------+---------+
-
 3.1 FREQUENCIES.  AVAR: 
 +--------+--------+---+---+
 |        |        |   |Cum|
@@ -141,7 +139,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |      80|       1|  0|100|
 |      94|       1|  0|100|
 +--------+--------+---+---+
-
 +-----------------+---------+
 |N         Valid  |      730|
 |          Missing|        0|