* bugs/overwrite-input-file.sh: Don't use non-portable "diff -B".

* bugs/overwrite-special-file.sh: Ditto.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 776e7a4f381ac9c8c4c0312d13d0cebceda620e4..3137a02d819a9b71ec9ddd8f2dd0e03a55fcde3e 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-07  Ben Pfaff  <blp@gnu.org>
+
+       * bugs/overwrite-input-file.sh: Don't use non-portable "diff -B".
+
+       * bugs/overwrite-special-file.sh: Ditto.
+
+       Reported by Jason Stover.
+
 2007-11-03  Ben Pfaff  <blp@gnu.org>
 
        Allow output files to overwrite input files (bug #21280).

diff --git a/tests/bugs/overwrite-input-file.sh b/tests/bugs/overwrite-input-file.sh
index 185de8b482b5c92493869e198740a9dd3708a88e..8c1fecddbb666e9c9f713a2007e915e17782aa68 100755 (executable)
--- a/tests/bugs/overwrite-input-file.sh
+++ b/tests/bugs/overwrite-input-file.sh
@@ -162,7 +162,8 @@ $SUPERVISOR $PSPP --testing-mode $TESTFILE -e /dev/null
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b pspp.list - << EOF
        X        Y
 -------- --------
     1.00     2.00
@@ -170,7 +171,6 @@ diff -b -B pspp.list - << EOF
     3.00     4.00
     4.00     5.00
     5.00     6.00
-
 X        Y
 - --------
 1     3.00
@@ -178,7 +178,6 @@ X        Y
 3     5.00
 4     6.00
 5     7.00
-
 X        Y
 - --------
 1     4.00

diff --git a/tests/bugs/overwrite-special-file.sh b/tests/bugs/overwrite-special-file.sh
index bdc2dc1e168798ce7865871eea4187755dad277d..c23a8d4a858cdbbcd9f6cb17338226fc87ecfe7f 100755 (executable)
--- a/tests/bugs/overwrite-special-file.sh
+++ b/tests/bugs/overwrite-special-file.sh
@@ -84,7 +84,8 @@ $SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check that foo2.out was created"
-diff -b -B foo2.out - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b foo2.out - << EOF
  1
  2
  3