Fix the use of grep.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 19fab78015b9b08f76eeb35d5ee4eb6029961111..697bc9672164b711009a3377e9e8776d84594b9f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-19  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgfmt-3: Use two grep invocations instead of a complex regexp that
+       only GNU grep understands.
+       * msgmerge-5: Likewise.
+       * xgettext-3: Likewise.
+
 2001-04-17  Bruno Haible  <haible@clisp.cons.org>
 
        * plural-2: Change formula and result for sl. Add test for lt.

diff --git a/tests/msgfmt-3 b/tests/msgfmt-3
index e961bf153639d9086bee749bdb75c078f15cd1a6..89f4632b5ff6691d6c3a891b415148285b78b0d3 100755 (executable)
--- a/tests/msgfmt-3
+++ b/tests/msgfmt-3
@@ -21,7 +21,7 @@ tmpfiles="$tmpfiles mftest3.mo"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} mf-test3.po -o mftest3.mo 2>&1 \
-  | grep -v '\(warning: Charset\|^ \)'
+  | grep -v 'warning: Charset' | grep -v '^ '
 
 test ! -f mftest3.mo
 result=$?

diff --git a/tests/msgmerge-5 b/tests/msgmerge-5
index c9d0c07334b48a2820bd5a3a7f549fccbeb4e36c..6686f1a59531f33db418dd8f6bee2fa7d75bcec8 100755 (executable)
--- a/tests/msgmerge-5
+++ b/tests/msgmerge-5
@@ -40,7 +40,7 @@ tmpfiles="$tmpfiles mm-test5.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out 2>&1 \
-  | grep -v '\(warning: Charset\|^ \)'
+  | grep -v 'warning: Charset' | grep -v '^ '
 
 tmpfiles="$tmpfiles mm-test5.ok"
 cat <<EOF > mm-test5.ok

diff --git a/tests/xgettext-3 b/tests/xgettext-3
index 380208d64bb53536fcfbdc06da683d4755b1b6c3..a7575dc059f7a12781de61f20558b4c0b00d4f9a 100755 (executable)
--- a/tests/xgettext-3
+++ b/tests/xgettext-3
@@ -10,7 +10,7 @@ rm -f zero-domain.po
 LC_MESSAGES=C LC_ALL= \
 ${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext.pot \
   $top_srcdir/src/xgettext.c 2>&1 \
-  | grep -v '\(warning: Charset\|^ \)'
+  | grep -v 'warning: Charset' | grep -v '^ '
 
 test ! -f zero-domain.po
 result=$?