diff options
-rw-r--r-- | tests/ChangeLog | 7 | ||||
-rwxr-xr-x | tests/msgfmt-3 | 2 | ||||
-rwxr-xr-x | tests/msgmerge-5 | 2 | ||||
-rwxr-xr-x | tests/xgettext-3 | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 19fab78..697bc96 100644 --- 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 e961bf1..89f4632 100755 --- 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 c9d0c07..6686f1a 100755 --- 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 380208d..a7575dc 100755 --- 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=$? |