* npar-binomial.sh: Be less picky about whitespace in PSPP output.

* npar-chisquare.sh: Ditto.

* very-long-strings.sh: Ditto.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 62057ed7d3cbdd526b801e82931fd633a2016289..66e793d187c4f09d8033cea3871aa58b5cd7a822 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-03  Ben Pfaff  <blp@gnu.org>
+           John McCabe-Dansted <gmatht@gmail.com>
+       
+       * npar-binomial.sh: Be less picky about whitespace in PSPP output.
+
+       * npar-chisquare.sh: Ditto.
+
+       * very-long-strings.sh: Ditto.
+
 2007-04-03  Ben Pfaff  <blp@gnu.org>
 
        Apply patches #5828, #5837, #5841, #5843.

diff --git a/tests/command/npar-binomial.sh b/tests/command/npar-binomial.sh
index db7b9763197da9e35cdd31553ec510195f3edb79..6fc35117cb6b2a53536a2c8beab76b7975d212aa 100755 (executable)
--- a/tests/command/npar-binomial.sh
+++ b/tests/command/npar-binomial.sh
@@ -217,7 +217,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.list - << EOF
 P < 0.5; N1/N2 < 1
 1.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+

diff --git a/tests/command/npar-chisquare.sh b/tests/command/npar-chisquare.sh
index 60503a9c67a5b2034ebb6124005d324776ea06d4..5a1b8af17952375323ae25b754428902d3d476d2 100755 (executable)
--- a/tests/command/npar-chisquare.sh
+++ b/tests/command/npar-chisquare.sh
@@ -96,7 +96,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.list - << EOF
 1.1 NPAR TESTS.  x
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -197,7 +197,7 @@ if [ $? -eq 0 ] ; then no_result ; fi
 
 activity="compare errors 2"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/output
-diff  $TEMPDIR/output - << EOF
+diff -b  $TEMPDIR/output - << EOF
 error: CHISQUARE test specified 6 expected values, but 4 distinct values were encountered in variable y.
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
@@ -237,7 +237,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 3"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |
@@ -308,7 +308,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 4"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |

diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index 2cc9e0ef9927a42a985d7fc033f1af82250e74a0..6d413aa4e35bc9f1e4d0e9de292d09f2f59fc321 100755 (executable)
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -76,7 +76,7 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare variable display 0"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
@@ -167,13 +167,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 # Check that the file read back in has the same data as what we wrote.
 
 activity="compare print"
-diff $TEMPDIR/out.txt $TEMPDIR/data
+diff -b $TEMPDIR/out.txt $TEMPDIR/data
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare variable display"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|