Fix Mingw test failures due to differences in line endings.

This commit changes "diff" invocations to ignore changes in white space to
avoid spurious test failures due to differences in line endings.

diff --git a/tests/command/npar-sign.sh b/tests/command/npar-sign.sh
index 5ce4ae8221a65c16964789260d9953fa3b1fefb0..d8cd0e092917a5dbc3d43cb0ee046329027615a0 100755 (executable)
--- a/tests/command/npar-sign.sh
+++ b/tests/command/npar-sign.sh
@@ -85,7 +85,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
-diff - $TEMPDIR/pspp.list <<EOF
+diff -b - $TEMPDIR/pspp.list <<EOF
 1.1 NPAR TESTS.  Frequencies
 #=================================#=#
 #                                 |N#

diff --git a/tests/command/npar-wilcoxon.sh b/tests/command/npar-wilcoxon.sh
index ffa4c2b0e96e102e0b182d48c4c5b8ac2d82d014..6b77bc083d136cac57fac7661ebc7f9daab91fdb 100755 (executable)
--- a/tests/command/npar-wilcoxon.sh
+++ b/tests/command/npar-wilcoxon.sh
@@ -121,7 +121,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 1"
-diff pspp.list $TEMPDIR/results.txt
+diff -b pspp.list $TEMPDIR/results.txt
 if [ $? -ne 0 ] ; then fail ; fi
 
 
@@ -165,7 +165,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 2"
-diff pspp.list $TEMPDIR/results.txt
+diff -b pspp.list $TEMPDIR/results.txt
 if [ $? -ne 0 ] ; then fail ; fi
 
 

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 96636eb13f6c64d5b659ada14a17a944f6ad4244..fe8d717b8e76a112456b266521e37d5f6458e1d6 100755 (executable)
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -109,7 +109,7 @@ $SUPERVISOR $PSPP --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/print.stat
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare print.out"
-diff $TEMPDIR/print.out - <<EOF
+diff -b $TEMPDIR/print.out - <<EOF
  1 2 
 112
  1 -2 
@@ -134,7 +134,7 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare write.out"
-diff $TEMPDIR/write.out - <<EOF
+diff -b $TEMPDIR/write.out - <<EOF
 12
 12
 1-2
@@ -159,7 +159,7 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.list - << EOF
 1 2 
 
 12

diff --git a/tests/command/reliability.sh b/tests/command/reliability.sh
index f7b8d5681adb5793d87006268800b7fd8943cb6b..b14d8db859e11f7ef294361f0815844605d6134d 100755 (executable)
--- a/tests/command/reliability.sh
+++ b/tests/command/reliability.sh
@@ -249,7 +249,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff pspp.list - << EOF
+diff -b pspp.list - << EOF
 Scale: Everything
 
 1.1 RELIABILITY.  Case Processing Summary