From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 15 Dec 2003 23:56:49 +0000 (+0000)
Subject: Fixed some changes, which didn't work with certain versions of diff
X-Git-Tag: v0.4.0~452
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=362ef6aa0dde26bc7ae7b2c042b47f96b8b1bca1;p=pspp-builds.git

Fixed some changes, which didn't work with certain versions of diff
---

diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index b84e63eb..597217f8 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -9,6 +9,7 @@ here=`pwd`;
 # ensure that top_srcdir is absolute
 cd $top_srcdir; top_srcdir=`pwd`
 
+
 export STAT_CONFIG_PATH=$top_srcdir/config
 
 cleanup()
@@ -71,9 +72,10 @@ activity="run program"
 $here/../src/pspp    -o raw-ascii $TEMPDIR/test.sps  
 if [ $? -ne 0 ] ; then no_result ; fi
 
+cat pspp.list > /tmp/foo
 
 activity="test result"
-diff  -B $TEMPDIR/pspp.list - << EOF
+diff  -b -w -B $TEMPDIR/pspp.list - << EOF
 X        Z      FOO
 - -------- --------
 1    15.00     6.00 
diff --git a/tests/command/autorecod.sh b/tests/command/autorecod.sh
index 08428c1e..2ef03f9f 100755
--- a/tests/command/autorecod.sh
+++ b/tests/command/autorecod.sh
@@ -77,7 +77,7 @@ $here/../src/pspp    -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="test output"
-diff -B $TEMPDIR/pspp.list - <<EOF
+diff -b -B $TEMPDIR/pspp.list - <<EOF
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index dc044bc9..cdbf0a6b 100755
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -88,7 +88,7 @@ $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
-diff -B $TEMPDIR/pspp.list - << foobar
+diff -b -B $TEMPDIR/pspp.list - << foobar
 ----------------------------------------------------------------------
 First we show that we can input data with BEGIN DATA/END DATA after
 a procedure.