From 9d300eb2922e69c9788456adb91ef15aadd3853e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Jan 2009 13:10:40 +0000 Subject: [PATCH] Avoid a test suite failure on platforms that have a gl_IE locale. --- gettext-tools/tests/ChangeLog | 5 +++++ gettext-tools/tests/msginit-1 | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index ced313f81..b87fac300 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2009-01-25 Bruno Haible + + Avoid a test suite failure on platforms that have a gl_IE locale. + * msginit-1: Normalize the charset of the generated PO file. + 2008-10-04 Bruno Haible * msgfmt-17: New file. diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1 index ac96164c7..3625397ab 100755 --- a/gettext-tools/tests/msginit-1 +++ b/gettext-tools/tests/msginit-1 @@ -44,7 +44,9 @@ tmpfiles="$tmpfiles mi-test1.tmp mi-test1.out mi-test1.err" : ${MSGINIT=msginit} ${MSGINIT} -i mi-test1.pot -l ga_IE --no-translator -o mi-test1.tmp 2>mi-test1.err test $? = 0 || { cat mi-test1.err 1>&2; rm -fr $tmpfiles; exit 1; } -sed -e '1,10d' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out +# The charset stored in the header entry is the locale encoding of the gl_IE +# locale, which is system dependent, or ASCII if the locale does not exist. +sed -e '1,10d' -e 's/\(ISO-8859-1\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out test $? = 0 || { rm -fr $tmpfiles; exit 1; } tmpfiles="$tmpfiles mi-test1.ok" -- 2.47.2