From 9f7fa95f59daac4c6c3dda9b0c59367d976970be Mon Sep 17 00:00:00 2001
From: Jason Stover <jhs@math.gcsu.edu>
Date: Thu, 27 Oct 2005 19:32:56 +0000
Subject: [PATCH] Fixed blank replacement

---
 tests/bugs/agg-crash-2.sh         | 5 ++---
 tests/bugs/compute-lv.sh          | 3 +--
 tests/bugs/crosstabs-crash.sh     | 7 ++-----
 tests/bugs/get.sh                 | 7 ++-----
 tests/bugs/match-files-scratch.sh | 5 ++---
 tests/bugs/multipass.sh           | 5 ++---
 tests/bugs/random.sh              | 5 ++---
 tests/bugs/t-test-alpha.sh        | 6 ++----
 tests/bugs/temp-freq.sh           | 7 ++-----
 tests/bugs/temporary.sh           | 5 ++---
 tests/xforms/casefile.sh          | 2 +-
 11 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh
index 9bec5da2..39d0ac0a 100755
--- a/tests/bugs/agg-crash-2.sh
+++ b/tests/bugs/agg-crash-2.sh
@@ -69,8 +69,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $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  -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
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -78,7 +78,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |X       |F8.2  |
 |Y       |A25   |
 +--------+------+
-
         X                         Y
 --------- -------------------------
     87.34 bar                       
diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index c1b4fec5..558ea854 100755
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -72,7 +72,7 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
 perl -pi -e 's/^\s*$//g' pspp.list
-diff -b pspp.list - << EOF |perl -e 's/^\s*$//g'
+diff -b pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +----------------+------+
 |    Variable    |Format|
@@ -80,7 +80,6 @@ diff -b pspp.list - << EOF |perl -e 's/^\s*$//g'
 |longVariablename|F8.0  |
 |x               |F8.0  |
 +----------------+------+
-
 longVariablename        x
 ---------------- -------- 
            99.00     2.00
diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh
index 82030df5..e50ed5f7 100755
--- a/tests/bugs/crosstabs-crash.sh
+++ b/tests/bugs/crosstabs-crash.sh
@@ -64,8 +64,8 @@ $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  -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
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -75,7 +75,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |X       |F8.0  |
 |Y       |F8.0  |
 +--------+------+
-
 2.1 CROSSTABS.  Summary.
 #===============#=====================================================#
 #               #                        Cases                        #
@@ -86,7 +85,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #---------------#--------+--------+--------+--------+--------+--------#
 #X * Y          #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #===============#========#========#========#========#========#========#
-
 2.2 CROSSTABS.  X by Y [count].
 #===============#==============================================================#========#
 #               #                               Y                              |        #
@@ -102,7 +100,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #           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/bugs/get.sh b/tests/bugs/get.sh
index cd37b4a0..740b7b5c 100755
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -86,8 +86,8 @@ 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
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -98,8 +98,6 @@ LOCATION   EDITOR    SHELL     FREQ
      2.00     1.00     2.00    22.00 
      2.00     2.00     1.00     1.00 
      2.00     2.00     2.00     3.00 
- 
-
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 
@@ -110,7 +108,6 @@ LOCATION   EDITOR    SHELL     FREQ
      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/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh
index 66a3ea3e..c36bc9ad 100755
--- a/tests/bugs/match-files-scratch.sh
+++ b/tests/bugs/match-files-scratch.sh
@@ -74,8 +74,8 @@ $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  -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
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -84,7 +84,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |x       |F8.0  |
 |y       |F8.0  |
 +--------+------+
-
        x        y        j
 -------- -------- --------
     5.00     6.00    55.00 
diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh
index b88d62a1..98ad523b 100755
--- a/tests/bugs/multipass.sh
+++ b/tests/bugs/multipass.sh
@@ -74,8 +74,8 @@ $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  -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
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -83,7 +83,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |ID      |F8.0  |
 |ABC     |F8.0  |
 +--------+------+
-
 2.1 DESCRIPTIVES.  Valid cases = 6; cases with missing value(s) = 0.
 +--------#-+-----+-------+-------+-------+
 |Variable#N| Mean|Std Dev|Minimum|Maximum|
diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index ae4d4774..263bf815 100755
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -72,8 +72,8 @@ 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
       R1
 --------
      7.71 
@@ -96,7 +96,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
      2.64 
       .88 
      1.50 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index 6b561054..7d1c3ed0 100755
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -78,8 +78,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|
@@ -89,7 +89,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 |DEP1    |F8.0  |
 |DEP2    |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Group Statistics
 #==========#=#====#==============#========#
 #     INDEP|N|Mean|Std. Deviation|SE. Mean#
@@ -99,7 +98,6 @@ diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 #DEP2 a    |5|4.00|          .707|    .316#
 #     b    |5|2.00|          .707|    .316#
 #==========#=#====#==============#========#
-
 2.2 T-TEST.  Independent Samples Test
 #===============================#==========#===============================================================================#
 #                               # Levene's |                          t-test for Equality of Means                         #
diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 5e7f31c3..47741931 100755
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -75,8 +75,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $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  -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
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -84,7 +84,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |SEX     |A1    |
 |X       |F8.0  |
 +--------+------+
-
 2.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
@@ -97,7 +96,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 #===========#========#=========#========#========#========#
 |               Total|        4|   100.0|   100.0|        |
 +--------------------+---------+--------+--------+--------+
-
 +---------------+------+
 |N       Valid  |     4|
 |        Missing|     0|
@@ -106,7 +104,6 @@ diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |Minimum        |12.000|
 |Maximum        |31.000|
 +---------------+------+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh
index 6d9a190f..25df5c0c 100755
--- a/tests/bugs/temporary.sh
+++ b/tests/bugs/temporary.sh
@@ -76,15 +76,14 @@ $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  -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
 --------
     6.00 
     7.00 
     8.00 
     9.00 
-
        X
 --------
     1.00 
diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh
index f6aa54b2..c7b8906c 100755
--- a/tests/xforms/casefile.sh
+++ b/tests/xforms/casefile.sh
@@ -59,7 +59,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/casefile.out
-diff -b $TEMPDIR/casefile.out - <<EOF |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/casefile.out - <<EOF
 Casefile tests succeeded.
 EOF
 
-- 
2.30.2