From 692311e8b42e47c4886896c6e2d2fbf846151652 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 27 Jan 2005 23:45:58 +0000
Subject: [PATCH] Fixed some tests that were failing under cygwin

---
 configure.ac                         | 3 ++-
 tests/command/examine-extremes.sh    | 2 +-
 tests/command/examine-percentiles.sh | 2 +-
 tests/command/examine.sh             | 2 +-
 tests/command/import-export.sh       | 2 +-
 tests/command/oneway-with-splits.sh  | 2 +-
 tests/command/oneway.sh              | 2 +-
 tests/command/trimmed-mean.sh        | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 49f3a0b3..e3da678e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,8 @@ AC_HEADER_TIME
 
 AC_C_CONST
 AC_C_INLINE
-AC_TYPE_OFF_T
+dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
+AC_CHECK_TYPES(off_t) 
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
 
diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index e4d39bdc..735a7f0d 100755
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -87,7 +87,7 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 EXAMINE.  Case Processing Summary
 #==#===============================#
 #  #             Cases             #
diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index 2428009a..40490448 100755
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -80,7 +80,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
diff --git a/tests/command/examine.sh b/tests/command/examine.sh
index 6e27eeb8..178df9df 100755
--- a/tests/command/examine.sh
+++ b/tests/command/examine.sh
@@ -92,7 +92,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 # NOTE:  In the following data: Only the extreme values have been checked
 # The descriptives have been blindly pasted.
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
index 9c92637d..074b4f3a 100755
--- a/tests/command/import-export.sh
+++ b/tests/command/import-export.sh
@@ -71,7 +71,7 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index 8f2c24cc..e5d7aaab 100755
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -89,7 +89,7 @@ activity="run program"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index a729f68b..cedaedf8 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -86,7 +86,7 @@ activity="run program"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 80097a12..ef11003b 100755
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.sh
@@ -73,7 +73,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
-- 
2.30.2