Re: diff -B

[Ben Pfaff]

Ben Pfaff <address@hidden> writes:

> Jason Stover <address@hidden> writes:
>
>> diff -B is causing overwrite-input-file.sh and
>> overwrite-special-file.sh to fail on BSD, whose diff has no -B.
>
> You're right, this is a bug.  Thank you for reporting it.  I'll
> fix it tonight.

This should fix it.  Would you mind trying it out?  I will check
it in, if it works.

Index: b/tests/bugs/overwrite-input-file.sh
===================================================================
--- a/tests/bugs/overwrite-input-file.sh
+++ b/tests/bugs/overwrite-input-file.sh
@@ -162,7 +162,8 @@ $SUPERVISOR $PSPP --testing-mode $TESTFI
 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
Index: b/tests/bugs/overwrite-special-file.sh
===================================================================
--- a/tests/bugs/overwrite-special-file.sh
+++ b/tests/bugs/overwrite-special-file.sh
@@ -84,7 +84,8 @@ $SUPERVISOR $PSPP --testing-mode $TESTFI
 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

-- 
"I've given vodka years and years of oral pleasure, and it's done the
 same for me.  And neither of us has really taken any steps to take the
 relationship to the `next level.'"
--Jeremy Hunt