Thanks for the report. paul zimmermann <paul.zimmerm...@inria.fr> writes:
> FAIL: msgfilter-8 > ================= > > 35c35 > < "non-terminated line" > --- >> "-n non-terminated line" > FAIL msgfilter-8 (exit status: 1) For this, I've committed the attached fix. > FAIL: lang-bash > =============== > > 1c1 > < «Votre commande, s'il vous plait», dit le garçon. > --- >> �Votre commande, s'il vous plait�, dit le gar�on. > FAIL lang-bash (exit status: 1) Hmm, this is a familiar issue on Mac OS X: https://lists.gnu.org/archive/html/bug-gettext/2014-11/msg00012.html > poire:~ caramel$ uname -a > Darwin poire.loria.fr 12.5.0 Darwin Kernel Version 12.5.0: Sun Sep 29 > 13:33:47 PDT 2013; root:xnu-2050.48.12~1/RELEASE_X86_64 x86_64 Since it seems unlikely to be fixed, perhaps we should skip it if $host_os = "darwin*" Regards, -- Daiki Ueno
>From 3056574daf60f3e68fbaffdb1ad6991cdc11a48b Mon Sep 17 00:00:00 2001 From: Daiki Ueno <u...@gnu.org> Date: Wed, 24 Jun 2015 12:04:25 +0900 Subject: [PATCH] tests: Don't rely on echo -n * gettext-tools/tests/msgfilter-8: Port the "echo -n" equivalent from gettext-2. Reported by paul zimmermann in: <https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00019.html>. --- gettext-tools/tests/ChangeLog | 6 ++++++ gettext-tools/tests/msgfilter-8 | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 6c10a38..c02908b 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,5 +1,11 @@ 2015-06-24 Daiki Ueno <u...@gnu.org> + * msgfilter-8: Port the "echo -n" equivalent from gettext-2. + Reported by paul zimmermann in: + <https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00019.html>. + +2015-06-24 Daiki Ueno <u...@gnu.org> + * cldr-plurals-1: Skip if XML is not supported. * msginit-4: Likewise. diff --git a/gettext-tools/tests/msgfilter-8 b/gettext-tools/tests/msgfilter-8 index 49cf2c0..3ffcb5e 100755 --- a/gettext-tools/tests/msgfilter-8 +++ b/gettext-tools/tests/msgfilter-8 @@ -3,6 +3,18 @@ # Test --newline option. +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says gh...@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + cat <<\EOF > mfi-test8.po # HEADER. # @@ -57,7 +69,7 @@ cat <<\EOF > filter.sh #!/bin/sh cat if test "$MSGFILTER_MSGID" = "the excitement of a love affair"; then - echo -n non-terminated line + echo $ac_n "non-terminated line$ac_c" else echo terminated line fi -- 2.4.2
