From: Bruno Haible <bruno@clisp.org>
Date: Mon, 11 Nov 2002 15:35:01 +0000 (+0000)
Subject: Make it work with valgrind.
X-Git-Tag: v0.12~1220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b58d3e4db6231ed830464d95e0f5819e863df03;p=thirdparty%2Fgettext.git

Make it work with valgrind.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5f76d0f2c..07c7dfcf8 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-07  Bruno Haible  <bruno@clisp.org>
+
+	* msgcmp-2: Filter out valgrind's messages from the stderr output.
+	* msgfmt-7: Likewise.
+	* msgfmt-8: Likewise.
+	* msgfmt-9: Likewise.
+	* msgfmt-10: Likewise.
+	* msgmerge-2: Likewise.
+	* msgmerge-13: Likewise.
+
 2002-11-05  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext-23: New file.
diff --git a/tests/msgcmp-2 b/tests/msgcmp-2
index 14be05d50..2f333f1d9 100755
--- a/tests/msgcmp-2
+++ b/tests/msgcmp-2
@@ -22,7 +22,7 @@ EOF
 tmpfiles="$tmpfiles mc-test2.out"
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test2.in1 mc-test2.in2 > mc-test2.out 2>&1
+${MSGCMP} mc-test2.in1 mc-test2.in2 2>&1 | grep -v '^==' > mc-test2.out
 
 tmpfiles="$tmpfiles mc-test2.ok"
 cat <<EOF > mc-test2.ok
diff --git a/tests/msgfmt-10 b/tests/msgfmt-10
index 12ec483f0..fad6c17c5 100755
--- a/tests/msgfmt-10
+++ b/tests/msgfmt-10
@@ -70,7 +70,7 @@ tmpfiles="$tmpfiles mf-test10.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --check mf-test10.po2 -o /dev/null \
-    2> mf-test10.err
+    2>&1 | grep -v '^==' > mf-test10.err
 
 tmpfiles="$tmpfiles mf-test10.ok"
 cat << EOF > mf-test10.ok
diff --git a/tests/msgfmt-7 b/tests/msgfmt-7
index 2bf5190ad..002cf6dc0 100755
--- a/tests/msgfmt-7
+++ b/tests/msgfmt-7
@@ -30,7 +30,7 @@ tmpfiles="$tmpfiles mf-test7.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test7.in1 -o /dev/null \
-    2> mf-test7.err
+    2>&1 | grep -v '^==' > mf-test7.err
 
 tmpfiles="$tmpfiles mf-test7.ok"
 cat << EOF > mf-test7.ok
diff --git a/tests/msgfmt-8 b/tests/msgfmt-8
index 7f4202354..c5467edca 100755
--- a/tests/msgfmt-8
+++ b/tests/msgfmt-8
@@ -30,7 +30,7 @@ tmpfiles="$tmpfiles mf-test8.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test8.in1 -o /dev/null \
-    2> mf-test8.err
+    2>&1 | grep -v '^==' > mf-test8.err
 
 tmpfiles="$tmpfiles mf-test8.ok"
 cat << EOF > mf-test8.ok
diff --git a/tests/msgfmt-9 b/tests/msgfmt-9
index 08419294b..1574916b0 100755
--- a/tests/msgfmt-9
+++ b/tests/msgfmt-9
@@ -33,7 +33,7 @@ tmpfiles="$tmpfiles mf-test9.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} --verbose --check mf-test9.in1 -o /dev/null \
-    2> mf-test9.err
+    2>&1 | grep -v '^==' > mf-test9.err
 
 tmpfiles="$tmpfiles mf-test9.ok"
 cat << EOF > mf-test9.ok
diff --git a/tests/msgmerge-13 b/tests/msgmerge-13
index 8ec5ba2c3..8e9c207cd 100755
--- a/tests/msgmerge-13
+++ b/tests/msgmerge-13
@@ -25,7 +25,7 @@ tmpfiles="$tmpfiles mm-test13.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q mm-test13.in1 mm-test13.in2 -o /dev/null \
-    2> mm-test13.err
+    2>&1 | grep -v '^==' > mm-test13.err
 
 tmpfiles="$tmpfiles mm-test13.ok"
 cat << EOF > mm-test13.ok
diff --git a/tests/msgmerge-2 b/tests/msgmerge-2
index d3bd69e32..8c880dbf1 100755
--- a/tests/msgmerge-2
+++ b/tests/msgmerge-2
@@ -20,7 +20,7 @@ tmpfiles="$tmpfiles mm-test2.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q mm-test2.in1 mm-test2.in2 -o /dev/stdout \
-  2> mm-test2.out
+  2>&1 | grep -v '^==' > mm-test2.out
 
 tmpfiles="$tmpfiles mm-test2.ok"
 cat << EOF > mm-test2.ok