Made BSD diff compatible

diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh
index cd2fd1e34a550e372a99c6ee40bb8c3c2e35426b..9bec5da2869da28a530a4374d9b0e88a67d28762 100755 (executable)
--- a/tests/bugs/agg-crash-2.sh
+++ b/tests/bugs/agg-crash-2.sh
@@ -69,7 +69,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index 2be6b0210caebb5fa4c07df596ada2d602a61b28..c1b4fec57ee07830dbc9156ddcda24013a8e52b9 100755 (executable)
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -71,7 +71,8 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-diff -B -b pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b pspp.list - << EOF |perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +----------------+------+
 |    Variable    |Format|

diff --git a/tests/bugs/computebug.out b/tests/bugs/computebug.out
index 59d93d0658ef204765fb3eb2511bd3fec5cdd28a..73640d4644b1aa3c6d400cd5a09a595ac9d94069 100644 (file)
--- a/tests/bugs/computebug.out
+++ b/tests/bugs/computebug.out
@@ -5,9 +5,7 @@
 |A       |A161  |
 |B       |A3    |
 +--------+------+
-
                                                                                                                                                                 A   B
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------- ---
 ABC                                                                                                                                                               def 
 GHI                                                                                                                                                               jkl 
-

diff --git a/tests/bugs/computebug.sh b/tests/bugs/computebug.sh
index e29fa29c8e5727194a68beb10f8a05fe439280b0..af19f82b9c93f8549af6be75be9e7b189223071b 100755 (executable)
--- a/tests/bugs/computebug.sh
+++ b/tests/bugs/computebug.sh
@@ -61,7 +61,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/computebug.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;

diff --git a/tests/bugs/crosstabs-crash.sh b/tests/bugs/crosstabs-crash.sh
index f77ce50bfa395158fe3c8b2bd8c7ba5350241e70..82030df5648a8ba4293dbc519732a90b9d521efb 100755 (executable)
--- a/tests/bugs/crosstabs-crash.sh
+++ b/tests/bugs/crosstabs-crash.sh
@@ -64,7 +64,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/get.sh b/tests/bugs/get.sh
index 4fddea75d746bc368c6c34e090b6261cc6f6173c..cd37b4a003920ff34969bbe81164a05b31ce4944 100755 (executable)
--- a/tests/bugs/get.sh
+++ b/tests/bugs/get.sh
@@ -86,7 +86,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 LOCATION   EDITOR    SHELL     FREQ
  -------- -------- -------- --------
      1.00     1.00     1.00     2.00 

diff --git a/tests/bugs/match-files-scratch.sh b/tests/bugs/match-files-scratch.sh
index ce562c75b2ea239e9360fc6f77d897f6c3254d40..66a3ea3e250f85defb7e5795332d4202bbe2718c 100755 (executable)
--- a/tests/bugs/match-files-scratch.sh
+++ b/tests/bugs/match-files-scratch.sh
@@ -74,7 +74,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/multipass.sh b/tests/bugs/multipass.sh
index 524b7160382b7b28129509365dc8bc3421f98f6b..b88d62a19de332dae751db7282e1cd338be1b82c 100755 (executable)
--- a/tests/bugs/multipass.sh
+++ b/tests/bugs/multipass.sh
@@ -74,7 +74,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/random.sh b/tests/bugs/random.sh
index 659b6935d66fde2ff1e34b3862113ee4a0cde5c8..ae4d4774b05dfa3f8cee308f4635288ba1ac38c3 100755 (executable)
--- a/tests/bugs/random.sh
+++ b/tests/bugs/random.sh
@@ -72,7 +72,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
       R1
 --------
      7.71 

diff --git a/tests/bugs/recode-copy-bug-1.out b/tests/bugs/recode-copy-bug-1.out
index 961a79bd9e9f61e810a4ce109a51f64c03d2f7ed..47113b9b094873b7733818986e64cb7abbab6f20 100644 (file)
--- a/tests/bugs/recode-copy-bug-1.out
+++ b/tests/bugs/recode-copy-bug-1.out
@@ -5,10 +5,8 @@
 |A       |A1    |
 |B       |A1    |
 +--------+------+
-
 A B
 - -
 3 2 
 2 3 
 1 4 
-

diff --git a/tests/bugs/recode-copy-bug-2.out b/tests/bugs/recode-copy-bug-2.out
index af6810fb1f720b9bb13a6f18c68d97dcb7833f89..88674322a565ed08178eee6ae23d6ef35a935859 100644 (file)
--- a/tests/bugs/recode-copy-bug-2.out
+++ b/tests/bugs/recode-copy-bug-2.out
@@ -5,10 +5,8 @@
 |A       |A1    |
 |B       |A1    |
 +--------+------+
-
 A B A1
 - - --
 1 2  3 
 2 3  2 
 3 4  1 
-

diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh
index 1959831e006b4517a47e5b762ee535a4f8ebb923..aec41a1df7707bf05e84a958630383d355d957c7 100755 (executable)
--- a/tests/bugs/recode-copy-bug.sh
+++ b/tests/bugs/recode-copy-bug.sh
@@ -65,7 +65,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 
@@ -75,7 +76,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;

diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index befc9eb9ac709970e0e60ebf7a416de35be75610..6b56105435f83536505dc33b3097686b81462f21 100755 (executable)
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -78,7 +78,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/t-test-with-temp.sh b/tests/bugs/t-test-with-temp.sh
index 65b669e11720e3d4662745b9334431d74ba8a68d..1bebba99fbf21a812b64867eca837edaeb48a153 100755 (executable)
--- a/tests/bugs/t-test-with-temp.sh
+++ b/tests/bugs/t-test-with-temp.sh
@@ -95,7 +95,8 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list $TEMPDIR/first.list
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $TEMPDIR/first.list
+diff -b $TEMPDIR/pspp.list $TEMPDIR/first.list
 if [ $? -ne 0 ] ; then fail ; fi
 
 

diff --git a/tests/bugs/temp-freq.sh b/tests/bugs/temp-freq.sh
index 63ac638de16cc8431e522a62258719a95cda292f..5e7f31c3f892748067f2f728a2658a287f137f81 100755 (executable)
--- a/tests/bugs/temp-freq.sh
+++ b/tests/bugs/temp-freq.sh
@@ -75,7 +75,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

diff --git a/tests/bugs/temporary.sh b/tests/bugs/temporary.sh
index 7f7afb312d7df13ea17bb147e73852204580e578..6d9a190f4596a621ef9c3de49d0a97d405e438b7 100755 (executable)
--- a/tests/bugs/temporary.sh
+++ b/tests/bugs/temporary.sh
@@ -76,7 +76,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
        X
 --------
     6.00 

diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 9c7f4c12aeb8fa20f7c1b6dd20a4d2b1427b3423..534c93b4cc275b22bc6fdab0561b30a3bc8de753 100755 (executable)
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -204,7 +204,8 @@ for outfile in active external; do
            if [ $? -ne 0 ] ; then no_result ; fi
 
            activity="check $name output"
-           diff -b -w -B pspp.list agg-$missing.out
+           perl -pi -e 's/^\s*$//g' pspp.list agg-$missing.out
+           diff -b -w pspp.list agg-$missing.out
            if [ $? -ne 0 ] ; then fail ; fi
        done
     done

diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index 846d936ca73b6b08eca136561ea6eee31041400b..4c6ee92d3edf4c53e754d58ca4bbf0c79f1505f3 100755 (executable)
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -80,7 +80,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
-diff -b -B $TEMPDIR/pspp.list - << foobar
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << foobar |perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|

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

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index c619ca25799bf4233d78518f304de9bdad8e7ccc..da1f6b54246c407e3d03f561503e850693306af1 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -114,8 +114,9 @@ for count_repeat_buffers in \
   activity="run program"
   $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii sort.pspp
   if [ $? -ne 0 ] ; then no_result ; fi
- 
-  diff -B -w sort.exp sort.out
+  
+  perl -pi -e 's/^\s*$//g' sort.exp sort.out
+  diff -w sort.exp sort.out
   if [ $? -ne 0 ] ; then fail ; fi
 done
 echo

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 097a9c831761ce8f32e2d5f290d3b74ec03eab1f..34acd488fe4afc77b83cc14e0a8d0e6987e4f27b 100755 (executable)
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -76,7 +76,8 @@ egrep -v '^(Created|Endian): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/out-filtered - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/out-filtered
+diff -b -w $TEMPDIR/out-filtered - << EOF |perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|

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

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index 0dd6c5fe74bee9c599665c6524830ec72c23f916..4dca4eaaf18437e760df74cf936ba13bc31d237c 100755 (executable)
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -79,7 +79,7 @@ $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
+perl -pi -e 's/^\s*\$//g' $TEMPDIR/pspp.list
 diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 variable001 variable002 variable003 variable004
 ----------- ----------- ----------- -----------

diff --git a/tests/expressions/epoch.sh b/tests/expressions/epoch.sh
index 914de328e14d42d565769f11889948cc6aa10b64..245322acf08e17ebcce6fe738a96e7fc37a68a57 100755 (executable)
--- a/tests/expressions/epoch.sh
+++ b/tests/expressions/epoch.sh
@@ -138,7 +138,8 @@ activity="run program"
 $SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/epoch.stat > $TEMPDIR/epoch.err 2> $TEMPDIR/epoch.out
 
 activity="compare results"
-diff -b -B $TEMPDIR/epoch.out - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/epoch.out
+diff -b $TEMPDIR/epoch.out - <<EOF |perl -e 's/^\s*$//g'
 YRMODA(0,1,1) = YRMODA(1900,1,1) => true
 YRMODA(1,1,1) = YRMODA(1901,1,1) => true
 YRMODA(12,1,1) = YRMODA(1912,1,1) => true

diff --git a/tests/expressions/expressions.sh b/tests/expressions/expressions.sh
index f1ff5050f6db8630e097d361704c37613d067cfe..b4850d7ebdc07eaac3b4123edaed7c6bd6662962 100755 (executable)
--- a/tests/expressions/expressions.sh
+++ b/tests/expressions/expressions.sh
@@ -1304,7 +1304,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
         $TEMPDIR/expr-opt.stat >$TEMPDIR/expr-opt.err 2> $TEMPDIR/expr-opt.out
 
 activity="compare optimizing output"
-diff -B -b $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
+diff -b $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="create non-optimizing input"
@@ -1319,7 +1320,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
        $TEMPDIR/expr-noopt.stat >$TEMPDIR/expr-noopt.err 2> $TEMPDIR/expr-noopt.out
 
 activity="compare non-optimizing output"
-diff -B -b $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
+diff -b $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="create optimizing postfix input"

diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh
index 8954338ed96a35b75212896491f3393a73b66aa2..bb02172f48ba65f2882f1515e00dd2cdcf0a1ff2 100755 (executable)
--- a/tests/expressions/randist.sh
+++ b/tests/expressions/randist.sh
@@ -64,7 +64,8 @@ if [ $? -ne 0 ] ; then fail ; fi
 for d in beta cauchy chisq exp f gamma laplace logistic lnormal \
         normal pareto t uniform weibull; do
     activity="compare output for $d distribution"
-    diff -B -b $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
+    perl -pi -e 's/^\s*$//g' $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
+    diff -b $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
     if [ $? -ne 0 ] ; then fail ; fi
 done
 

diff --git a/tests/expressions/variables.sh b/tests/expressions/variables.sh
index 0d32df42c58a9faf76658e058a791684eec58a58..444274e9fa1db75965c3e66fb18f53c4ed89b354 100755 (executable)
--- a/tests/expressions/variables.sh
+++ b/tests/expressions/variables.sh
@@ -97,7 +97,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/variables.stat > $TEMPDIR/va
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|

diff --git a/tests/expressions/vectors.sh b/tests/expressions/vectors.sh
index 07f7c31b1250164733cc23def44836ec0c474a67..610cf36b328477761cc48985cc21eb11a64ae9de 100755 (executable)
--- a/tests/expressions/vectors.sh
+++ b/tests/expressions/vectors.sh
@@ -73,7 +73,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/vectors.stat > $TEMPDIR/vect
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|

diff --git a/tests/stats/descript-basic.sh b/tests/stats/descript-basic.sh
index 8ce119e0975d1732b21bb189d8dd9c771d679ac9..c9e07f2cf5833fa7a5d0454b68533d9cbcd9bea8 100755 (executable)
--- a/tests/stats/descript-basic.sh
+++ b/tests/stats/descript-basic.sh
@@ -76,7 +76,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|

diff --git a/tests/stats/descript-mean-bug.sh b/tests/stats/descript-mean-bug.sh
index 16c6d3aecaae41cfaf0478a231db1cf40b85dc3f..3b7dcb0185ad09eb61db4e3fa945b1e7529ef60f 100755 (executable)
--- a/tests/stats/descript-mean-bug.sh
+++ b/tests/stats/descript-mean-bug.sh
@@ -71,7 +71,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DESCRIPTIVES.  Valid cases = 6; cases with missing value(s) = 0.
 +--------#-+-----+
 |Variable#N| Mean|

diff --git a/tests/stats/descript-missing.sh b/tests/stats/descript-missing.sh
index 77fa374cfbb9f4a62639cb9f8478135bcee8638e..a7c5249135301693bdbbce0e628d8aa3ccab4b72 100755 (executable)
--- a/tests/stats/descript-missing.sh
+++ b/tests/stats/descript-missing.sh
@@ -77,7 +77,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/descript.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|

diff --git a/tests/stats/moments.sh b/tests/stats/moments.sh
index 0c6806ab027c19f463344f95d37be9e78185c169..87cfd0e056a217aee2888b7161a4391799517ffa 100755 (executable)
--- a/tests/stats/moments.sh
+++ b/tests/stats/moments.sh
@@ -81,7 +81,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
         $TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out
 
 activity="compare two-pass output"
-diff -B -b $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
+diff -b $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="create input file"
@@ -94,7 +95,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
         $TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out
 
 activity="compare one-pass output"
-diff -B -b $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
+diff -b $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass

diff --git a/tests/stats/percentiles-compatible.sh b/tests/stats/percentiles-compatible.sh
index b3d997db478b501267fae0cc76c700bf0cb9f49f..fbd275aed847b7c51f61a8a5e3240b88249e4031 100755 (executable)
--- a/tests/stats/percentiles-compatible.sh
+++ b/tests/stats/percentiles-compatible.sh
@@ -76,7 +76,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |

diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh
index 083834968441f86353770b97d3ce9ef26e9b8628..87c4b069fca877bc5cc37266f13a73c6b3dfc19c 100755 (executable)
--- a/tests/stats/percentiles-enhanced.sh
+++ b/tests/stats/percentiles-enhanced.sh
@@ -75,7 +75,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
@@ -138,7 +139,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
@@ -199,7 +201,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |
@@ -259,7 +262,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 FREQUENCIES.  X: 
 +-----------+--------+---------+--------+--------+--------+
 |           |        |         |        |  Valid |   Cum  |

diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh
index f471dcff82a23d8e572f155c2dde4cfb7f3f3950..f6aa54b20d8d8572843c6237e81118c7fa0988e3 100755 (executable)
--- a/tests/xforms/casefile.sh
+++ b/tests/xforms/casefile.sh
@@ -58,7 +58,8 @@ $SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/c
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-diff -b -B $TEMPDIR/casefile.out - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/casefile.out
+diff -b $TEMPDIR/casefile.out - <<EOF |perl -e 's/^\s*$//g'
 Casefile tests succeeded.
 EOF
 

diff --git a/tests/xforms/expressions.sh b/tests/xforms/expressions.sh
index 12eb56e7a7aca77004ed75fc8006a7e5c1ff2704..dbe915caadc576a7611a6d96c3f2c2796a5e740a 100755 (executable)
--- a/tests/xforms/expressions.sh
+++ b/tests/xforms/expressions.sh
@@ -1008,7 +1008,8 @@ for d in *.expr; do
 
        # Compare.
        activity="$base, $optimize: compare output"
-       diff -B -b $base.clean $base.$optimize.out
+       perl -pi -e 's/^\s*$//g' $base.clean $base.$optimize.out
+       diff -b $base.clean $base.$optimize.out
        if [ $? -ne 0 ] ; then fail ; fi
     done
     num=`echo $d | sed 's/-.*//'`