From bd06b7ada822c3dd554a1e88ad71bf88da07eb41 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 29 Sep 2008 00:34:57 +0000 Subject: [PATCH] Avoid test suite failures on mingw. --- gettext-tools/tests/ChangeLog | 14 ++++++++++++++ gettext-tools/tests/msgexec-2 | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index f1918224a..90782d719 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,17 @@ +2008-09-28 Bruno Haible + + Avoid test suite failures on mingw. + * msgcmp-2: Normalize program name with .exe suffix also when it + occurs at the beginning of a line of error output. + * msgcmp-3: Likewise. + * msgfmt-7: Likewise. + * msgfmt-8: Likewise. + * msgfmt-9: Likewise. + * msgfmt-10: Likewise. + * msgmerge-2: Likewise. + * msgmerge-9: Likewise. + * msgexec-2: Convert CR/LF to LF before applying DIFF. + 2008-08-23 Bruno Haible * msgmerge-update-4: New file, based on msgmerge-update-3. diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2 index f0fcf34a3..8a55ca9c8 100755 --- a/gettext-tools/tests/msgexec-2 +++ b/gettext-tools/tests/msgexec-2 @@ -57,9 +57,11 @@ msgstr "" #~ msgstr "das einen verheirateten Mann liebt" EOF -tmpfiles="$tmpfiles mex-test2.out" +tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out" : ${MSGEXEC=msgexec} -${MSGEXEC} -i mex-test2.po 0 > mex-test2.out +${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp +test $? = 0 || { rm -fr $tmpfiles; exit 1; } +LC_ALL=C tr -d '\r' < mex-test2.tmp > mex-test2.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } : ${CMP=cmp} -- 2.47.2