Avoid a warning message on Cygwin.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 268ceeaa45c0e4d82d5e0ade0304b8adb1f1ef3d..71bee0750ccfd83812339d7b9fd652acebfc5780 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-14  Bruno Haible  <bruno@clisp.org>
+
+       Avoid a warning message on Cygwin.
+       * msggrep-7: Filter out msggrep's warning about locale charset.
+
 2009-08-13  Bruno Haible  <bruno@clisp.org>
 
        * msgexec-1: Filter out msgexec's warning about locale charset.

diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index 2809beb3537f3df87cd977fac97f6c0337c5a6d2..caa2e2e977d2298df99f7e60ed8727aa15108b49 100755 (executable)
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -51,11 +51,13 @@ msgstr "photocopieur"
 #~ msgstr "Enregistrer sous"
 EOF
 
-tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out"
+tmpfiles="$tmpfiles mg-test7.tmp mg-test7.out mg-test7.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po 2> mg-test7.err
+result=$?
+cat mg-test7.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out
 test $? = 0 || { rm -fr $tmpfiles; exit 1; }