From: Jason Stover <jhs@math.gcsu.edu>
Date: Mon, 10 Oct 2005 20:58:14 +0000 (+0000)
Subject: Made BSD diff compatible
X-Git-Tag: v0.6.0~1208
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f62700038e9edd7d8002242015a900a15626bceb;p=pspp-builds.git

Made BSD diff compatible
---

diff --git a/tests/command/match-files.sh b/tests/command/match-files.sh
index ef2714bd..7864921f 100755
--- a/tests/command/match-files.sh
+++ b/tests/command/match-files.sh
@@ -165,7 +165,9 @@ EOF
 	if [ $? -ne 0 ] ; then no_result ; fi
 
 	activity="check $name output"
-	diff -b -w -B pspp.list $types.out
+	perl -pi -e 's/^\s*$//g' pspp.list
+	perl -pi -e 's/^\s*$//g' $types.out
+	diff -b -w pspp.list $types.out
 	if [ $? -ne 0 ] ; then fail ; fi
     done
 done
@@ -188,7 +190,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF |perl -e 's/^\s*$//g'
 A B C D E F
 - - - - - -
 0 a A 1 b N
@@ -236,7 +239,8 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $name.pspp >/dev/null 2>&1
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check $name output"
-diff -b -w -B - pspp.list <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w - pspp.list <<EOF | perl -e 's/^\s*$//g'
         x        z        y
  -------- -------- --------
      3.00     8.00    30.00