Mercurial > hg > octave-lojdl > gnulib-hg

changeset 8841:6a8178e3452e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid test failures on mingw.
author Bruno Haible <bruno@clisp.org>
date Sat, 19 May 2007 15:28:02 +0000
parents 792e05ae7ac8
children 7605663b153e
files ChangeLog tests/test-fprintf-posix.sh tests/test-printf-posix.sh tests/test-vfprintf-posix.sh tests/test-vprintf-posix.sh
diffstat 5 files changed, 20 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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
--- 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
--- 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
--- 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