Fixed some tests that were failing under cygwin

diff --git a/configure.ac b/configure.ac
index 49f3a0b321a88051c1bc9c080cc351ac492efb0c..e3da678e616eda184b1f8fdd487af66d93e263a9 100644 (file)
--- 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 e4d39bdc59b1fc02ab62931cdf58eb84bc5aefb4..735a7f0df3b955c4d8a0bae39091432687851ff7 100755 (executable)
--- 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 2428009ad65ed9bf43df1430aed1819d20a94109..40490448d3e4e2b8948239690466077410dc0f81 100755 (executable)
--- 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 6e27eeb831ad6095bfaf49fa10e46a6f03c2d02a..178df9dfc354080f0cbcc17b660536bd220153f1 100755 (executable)
--- 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 9c92637d7ed29b293f53baafc0e2920a55943d78..074b4f3a6640c22f43064a0915b226e29549b6af 100755 (executable)
--- 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 8f2c24cca391c54b0886d41adafd6a60ee493036..e5d7aaabff06cad484e121ef06c9f506f003344c 100755 (executable)
--- 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 a729f68b5687eeda79e230258f99764e042127a2..cedaedf876cd7bb0c931512df8f962d5bb6f5918 100755 (executable)
--- 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 80097a121f547fcc10d0147fdb1448929d12991f..ef11003b43fd33af1a648f49c3f0c2abd4747bc1 100755 (executable)
--- 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|