Avoid test failures on mingw.

diff --git a/ChangeLog b/ChangeLog
index 785b19c0439231230988446d11e3ffc1f4670f0e..7fa76d1a5bd4faf75fd0aba3cd11bb16a48864df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-19  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test failures on mingw.
+       * tests/test-fprintf-posix.sh: Convert CR/LF to LF in output.
+       * tests/test-printf-posix.sh: Likewise.
+       * tests/test-vfprintf-posix.sh: Likewise.
+       * tests/test-vprintf-posix.sh: Likewise.
+
 2007-05-19  Bruno Haible  <bruno@clisp.org>
 
        Fix *printf result for NaN, Inf, -0.0 on mingw.

diff --git a/tests/test-fprintf-posix.sh b/tests/test-fprintf-posix.sh
index 7cc25b1c59540563a530009ecd0843e056cb112a..18ed2ece4b61f1048e94ae2ed280d9482bfda8a9 100755 (executable)
--- a/tests/test-fprintf-posix.sh
+++ b/tests/test-fprintf-posix.sh
@@ -3,11 +3,12 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-fprintf-posix.tmp"
+tmpfiles="$tmpfiles t-fprintf-posix.tmp t-fprintf-posix.out"
 ./test-fprintf-posix${EXEEXT} > t-fprintf-posix.tmp || exit 1
+tr -d '\r' < t-fprintf-posix.tmp > t-fprintf-posix.out || exit 1
 
 : ${DIFF=diff}
-${DIFF} "${srcdir}/test-printf-posix.output" t-fprintf-posix.tmp
+${DIFF} "${srcdir}/test-printf-posix.output" t-fprintf-posix.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/tests/test-printf-posix.sh b/tests/test-printf-posix.sh
index 29ab6f0a55ee9841adae4329d10a1a3e6f6574f1..036dde2905c36a22a0f49054c6746254039f59d4 100755 (executable)
--- a/tests/test-printf-posix.sh
+++ b/tests/test-printf-posix.sh
@@ -3,11 +3,12 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-printf-posix.tmp"
+tmpfiles="$tmpfiles t-printf-posix.tmp t-printf-posix.out"
 ./test-printf-posix${EXEEXT} > t-printf-posix.tmp || exit 1
+tr -d '\r' < t-printf-posix.tmp > t-printf-posix.out || exit 1
 
 : ${DIFF=diff}
-${DIFF} "${srcdir}/test-printf-posix.output" t-printf-posix.tmp
+${DIFF} "${srcdir}/test-printf-posix.output" t-printf-posix.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/tests/test-vfprintf-posix.sh b/tests/test-vfprintf-posix.sh
index c5ccc31e9b6b8a11ddc9a56dd1f5ce8566adc2fa..7544d674034cb64810bd570902ed441b050c367c 100755 (executable)
--- a/tests/test-vfprintf-posix.sh
+++ b/tests/test-vfprintf-posix.sh
@@ -3,11 +3,12 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-vfprintf-posix.tmp"
+tmpfiles="$tmpfiles t-vfprintf-posix.tmp t-vfprintf-posix.out"
 ./test-vfprintf-posix${EXEEXT} > t-vfprintf-posix.tmp || exit 1
+tr -d '\r' < t-vfprintf-posix.tmp > t-vfprintf-posix.out || exit 1
 
 : ${DIFF=diff}
-${DIFF} "${srcdir}/test-printf-posix.output" t-vfprintf-posix.tmp
+${DIFF} "${srcdir}/test-printf-posix.output" t-vfprintf-posix.out
 result=$?
 
 rm -fr $tmpfiles

diff --git a/tests/test-vprintf-posix.sh b/tests/test-vprintf-posix.sh
index 7eb457e8fc33b51ffcc6670b93d5805c028701d6..0258d30b705077834aefc027396188481ce99426 100755 (executable)
--- a/tests/test-vprintf-posix.sh
+++ b/tests/test-vprintf-posix.sh
@@ -3,11 +3,12 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles t-vprintf-posix.tmp"
+tmpfiles="$tmpfiles t-vprintf-posix.tmp t-vprintf-posix.out"
 ./test-vprintf-posix${EXEEXT} > t-vprintf-posix.tmp || exit 1
+tr -d '\r' < t-vprintf-posix.tmp > t-vprintf-posix.out || exit 1
 
 : ${DIFF=diff}
-${DIFF} "${srcdir}/test-printf-posix.output" t-vprintf-posix.tmp
+${DIFF} "${srcdir}/test-printf-posix.output" t-vprintf-posix.out
 result=$?
 
 rm -fr $tmpfiles