From b2be134b710812ede0a7e4746753fa7200d35e54 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 19 May 2007 15:28:02 +0000
Subject: [PATCH] Avoid test failures on mingw.

---
 ChangeLog                    | 8 ++++++++
 tests/test-fprintf-posix.sh  | 5 +++--
 tests/test-printf-posix.sh   | 5 +++--
 tests/test-vfprintf-posix.sh | 5 +++--
 tests/test-vprintf-posix.sh  | 5 +++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 785b19c043..7fa76d1a5b 100644
--- 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 7cc25b1c59..18ed2ece4b 100755
--- 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 29ab6f0a55..036dde2905 100755
--- 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 c5ccc31e9b..7544d67403 100755
--- 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 7eb457e8fc..0258d30b70 100755
--- 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
-- 
2.30.2