Fixed parsing of strings in CJK encodings. Muffle new warnings.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index cecff0efa69f26da1ed43d01b4dbea230247ba78..600023685f28618a207e12f89b6bcbcbf57b827c 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-03  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgfmt-3: Filter out charset related warning from msgfmt.
+       * msgmerge-5: Filter out charset related warning from msgmerge.
+       * xgettext-3: Filter out charset related warning from xgettext.
+       * xg-test1.ok.po: Regenerated.
+
 2001-03-03  Bruno Haible  <haible@clisp.cons.org>
 
        * test.mo: Change msgid so that it passes the newest msgfmt

diff --git a/tests/msgfmt-3 b/tests/msgfmt-3
index 3aeb9d11f647b97bb26c0331d0dc9afce65d2b9f..cfc588e132a51c3ff2348990566701029d878675 100755 (executable)
--- a/tests/msgfmt-3
+++ b/tests/msgfmt-3
@@ -19,7 +19,7 @@ EOF
 
 tmpfiles="$tmpfiles mftest3.mo"
 : ${MSGFMT=msgfmt}
-${MSGFMT} mf-test3.po -o mftest3.mo
+${MSGFMT} mf-test3.po -o mftest3.mo 2>&1 | grep -v 'warning: charset'
 
 test ! -f mftest3.mo
 result=$?

diff --git a/tests/msgmerge-5 b/tests/msgmerge-5
index 45cca000e43348e62a6b144b0651cc5b29abd202..642ecb3f1af89a82e812ed902c015aa292434062 100755 (executable)
--- a/tests/msgmerge-5
+++ b/tests/msgmerge-5
@@ -38,7 +38,8 @@ EOF
 
 tmpfiles="$tmpfiles mm-test5.out"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out
+${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out 2>&1 \
+  | grep -v 'warning: charset'
 
 tmpfiles="$tmpfiles mm-test5.ok"
 cat <<EOF > mm-test5.ok

diff --git a/tests/xg-test1.ok.po b/tests/xg-test1.ok.po
index 83b1cc7758999b0d64b24ebec71f761b59ed0f6f..d743432e8e3f20a09a790eb6043a69b85c21a2c9 100644 (file)
--- a/tests/xg-test1.ok.po
+++ b/tests/xg-test1.ok.po
@@ -195,18 +195,6 @@ msgstr ""
 msgid "field `%s' still has initial default value"
 msgstr ""
 
-#, c-format
-msgid ""
-"%s: warning: charset \"%s\" is not a portable encoding name\n"
-"%*s  warning: charset conversion might not work"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: warning: charset missing in header\n"
-"%*s  warning: charset conversion will not work"
-msgstr ""
-
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""

diff --git a/tests/xgettext-3 b/tests/xgettext-3
index 50e7a1083a9b117542e9d28dcb908a8e83fd4ca2..5cef9a2ad098a50bb28671a7e915e5a775f00f09 100755 (executable)
--- a/tests/xgettext-3
+++ b/tests/xgettext-3
@@ -8,7 +8,8 @@ tmpfiles="zero-domain.po"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext.pot \
-  $top_srcdir/src/xgettext.c
+  $top_srcdir/src/xgettext.c 2>&1 \
+  | grep -v 'warning: charset'
 
 test ! -f zero-domain.po
 result=$?