From: Bruno Haible <bruno@clisp.org>
Date: Thu, 13 Aug 2009 12:13:59 +0000 (+0200)
Subject: Filter out a warning about locale charset.
X-Git-Tag: v0.18~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09b020e2f935222eb9beb31faeedadd384bd745f;p=thirdparty%2Fgettext.git

Filter out a warning about locale charset.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 2e98245d9..587e37843 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-13  Bruno Haible  <bruno@clisp.org>
+
+	* msgexec-1: Filter out msgexec's warning about locale charset.
+	* msgexec-2: Likewise.
+
 2009-08-10  Bruno Haible  <bruno@clisp.org>
 
 	Avoid a test failure on Cygwin.
diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index b33a5514f..855af8863 100755
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -71,10 +71,13 @@ exit 0
 EOF
 chmod a+x mex-test1.sh
 
-tmpfiles="$tmpfiles mex-test1.out"
+tmpfiles="$tmpfiles mex-test1.out mex-test1.err"
 : ${MSGEXEC=msgexec}
-${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C \
+${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out 2> mex-test1.err
+result=$?
+cat mex-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mex-test1.ok"
 cat <<\EOF > mex-test1.ok
diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index 8a55ca9c8..9191d0598 100755
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -57,10 +57,13 @@ msgstr ""
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
-tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out"
+tmpfiles="$tmpfiles mex-test2.tmp mex-test2.out mex-test2.err"
 : ${MSGEXEC=msgexec}
-${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
+LC_ALL=C \
+${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp 2> mex-test2.err
+result=$?
+cat mex-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 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; }