From 962aaaca2a9650d60d2bd75fb2080ef491f19ccb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 7 Nov 2007 14:43:50 +0000 Subject: [PATCH] * bugs/overwrite-input-file.sh: Don't use non-portable "diff -B". * bugs/overwrite-special-file.sh: Ditto. --- tests/ChangeLog | 8 ++++++++ tests/bugs/overwrite-input-file.sh | 5 ++--- tests/bugs/overwrite-special-file.sh | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 776e7a4f..3137a02d 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,11 @@ +2007-11-07 Ben Pfaff + + * 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 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 185de8b4..8c1fecdd 100755 --- 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 bdc2dc1e..c23a8d4a 100755 --- 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 -- 2.30.2