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 085c2abfa0c3ea27e99e75ade8e198824796e4b8..6b85aef7e2bf889ebbf39632792921101c2aa901 100755 (executable)
--- a/tests/command/npar-sign.sh
+++ b/tests/command/npar-sign.sh
@@ -85,7 +85,7 @@ $SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
-diff -c - $TEMPDIR/pspp.csv <<EOF
+diff -b -c - $TEMPDIR/pspp.csv <<EOF
 Table: Frequencies
 ,,N
 height - age,Negative Differences,1

diff --git a/tests/command/npar-wilcoxon.sh b/tests/command/npar-wilcoxon.sh
index d5a9c63439faff5eb88ed1d71526b6907f106396..8c349999f9bb06b82bb700ce3c0999919ae8b49e 100755 (executable)
--- a/tests/command/npar-wilcoxon.sh
+++ b/tests/command/npar-wilcoxon.sh
@@ -114,7 +114,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 1"
-diff -c pspp.csv $TEMPDIR/results.csv
+diff -b -c pspp.csv $TEMPDIR/results.csv
 if [ $? -ne 0 ] ; then fail ; fi
 
 
@@ -158,7 +158,7 @@ $SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 2"
-diff pspp.csv $TEMPDIR/results.csv
+diff -b pspp.csv $TEMPDIR/results.csv
 if [ $? -ne 0 ] ; then fail ; fi
 
 

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 450e2100748702e19c5270ef72cdf6deb15784a7..9df49c13aabd59478cd75b058e666f5e5c6e72c8 100755 (executable)
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -109,7 +109,7 @@ $SUPERVISOR $PSPP -o pspp.csv --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.csv - << EOF
+diff -b $TEMPDIR/pspp.csv - << EOF
 1 2 
 
 

diff --git a/tests/command/reliability.sh b/tests/command/reliability.sh
index 689611946593cb7ab0c2dbddd96ead2adaed5f58..7c58145787c71c7ad8e9324457a7876ef7325f0c 100755 (executable)
--- a/tests/command/reliability.sh
+++ b/tests/command/reliability.sh
@@ -249,7 +249,7 @@ $SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -c pspp.csv - << EOF
+diff -c -b pspp.csv - << EOF
 Scale: Everything
 
 Table: Case Processing Summary