From: Jason Stover <jhs@math.gcsu.edu>
Date: Mon, 10 Oct 2005 22:18:06 +0000 (+0000)
Subject: Made BSD diff compatible
X-Git-Tag: v0.6.0~1204
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b08603f631a2d998d8c604692fdf13669bb5e510;p=pspp-builds.git
Made BSD diff compatible
---
diff --git a/tests/bugs/agg-crash-2.sh b/tests/bugs/agg-crash-2.sh
index cd2fd1e3..9bec5da2 100755
--- 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 2be6b021..c1b4fec5 100755
--- 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 59d93d06..73640d46 100644
--- 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 e29fa29c..af19f82b 100755
--- 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 f77ce50b..82030df5 100755
--- 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 4fddea75..cd37b4a0 100755
--- 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 ce562c75..66a3ea3e 100755
--- 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 524b7160..b88d62a1 100755
--- 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 659b6935..ae4d4774 100755
--- 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 961a79bd..47113b9b 100644
--- 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 af6810fb..88674322 100644
--- 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 1959831e..aec41a1d 100755
--- 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 befc9eb9..6b561054 100755
--- 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 65b669e1..1bebba99 100755
--- 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 63ac638d..5e7f31c3 100755
--- 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 7f7afb31..6d9a190f 100755
--- 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 9c7f4c12..534c93b4 100755
--- 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 846d936c..4c6ee92d 100755
--- 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 39d1b8dc..099df5f2 100755
--- 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 c619ca25..da1f6b54 100755
--- 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 097a9c83..34acd488 100755
--- 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 0931a0af..c1cc5ea9 100755
--- 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 0dd6c5fe..4dca4eaa 100755
--- 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 914de328..245322ac 100755
--- 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 f1ff5050..b4850d7e 100755
--- 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 8954338e..bb02172f 100755
--- 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 0d32df42..444274e9 100755
--- 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 07f7c31b..610cf36b 100755
--- 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 8ce119e0..c9e07f2c 100755
--- 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 16c6d3ae..3b7dcb01 100755
--- 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 77fa374c..a7c52491 100755
--- 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 0c6806ab..87cfd0e0 100755
--- 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 b3d997db..fbd275ae 100755
--- 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 08383496..87c4b069 100755
--- 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 f471dcff..f6aa54b2 100755
--- 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 12eb56e7..dbe915ca 100755
--- 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/-.*//'`