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: sid-i386-build93~2
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3baddf9934e9c4daa8db0065a08cedd92de7bf3d;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 5ce4ae82..d8cd0e09 100755
--- 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 ffa4c2b0..6b77bc08 100755
--- 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 96636eb1..fe8d717b 100755
--- 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 f7b8d568..b14d8db8 100755
--- 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