From: Ben Pfaff <blp@gnu.org>
Date: Sat, 17 Oct 2009 23:57:42 +0000 (-0700)
Subject: Fix Mingw test failures due to differences in line endings.
X-Git-Tag: v0.7.6~397
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c6eaf297d6220842264e72c44686b26d47474d1;p=pspp-builds.git

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 085c2abf..6b85aef7 100755
--- 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 d5a9c634..8c349999 100755
--- 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 450e2100..9df49c13 100755
--- 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 68961194..7c581457 100755
--- 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