Make it work with valgrind.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5f76d0f2c8f5341d6b077bf6b6a2592e55e5a3e3..07c7dfcf8ae34f7f0ee6901e409e39cce8e49a40 100644 (file)
--- 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 14be05d5039bfaa874561efe9a6a5395344d4921..2f333f1d9d52284b08b4077bb32a509a5d989e4c 100755 (executable)
--- 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 12ec483f02662ae4196e2aa7c7e6b90ddeedd892..fad6c17c59c7ade4afec5e73de5e008e83c5f610 100755 (executable)
--- 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 2bf5190adafae8136d8b5b430f41bbb2db9dd4e4..002cf6dc0aa1b59446dacc88d7c424b21c2dfabb 100755 (executable)
--- 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 7f42023549be7ddb266582bf7d46deab6cdf2fcb..c5467edcae6ab01832700105f2f0af30153e6f20 100755 (executable)
--- 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 08419294bccd7a30607b5f93b80c4fde0b17aa15..1574916b06ed3e0cf91e906eb8c67c716464359a 100755 (executable)
--- 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 8ec5ba2c31c1b2434ce64e1c23fe043058b59df0..8e9c207cd2dfd4583838dce79876da3f6b05962e 100755 (executable)
--- 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 d3bd69e3243ff6e850b019d6544b2ca341940b5e..8c880dbf1562378526a1b8bf14264b92a97838e5 100755 (executable)
--- 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