paul zimmermann <[email protected]> writes: >> > FAIL: msgfilter-8 > thanks, it fixes the problem.
Thanks for confirming that. >> > FAIL: lang-bash >> Hmm, this is a familiar issue on Mac OS X: >> https://lists.gnu.org/archive/html/bug-gettext/2014-11/msg00012.html >> >> Since it seems unlikely to be fixed, perhaps we should skip it if >> $host_os = "darwin*" I've made the attached change to skip the test on Mac OS X. Will announce the next pretest shortly. Thanks, -- Daiki Ueno
>From 362707b104c471366431a961d1fe7547bfc2ae07 Mon Sep 17 00:00:00 2001 From: Daiki Ueno <[email protected]> Date: Wed, 24 Jun 2015 17:27:16 +0900 Subject: [PATCH] tests: Skip lang-bash test for Mac OS X's bash * lang-bash: Skip if "bash --help" isn't localized on Mac OS X. --- gettext-tools/tests/ChangeLog | 4 ++++ gettext-tools/tests/lang-bash | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 59db278..b61ebcc 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,5 +1,9 @@ 2015-06-24 Daiki Ueno <[email protected]> + * lang-bash: Skip if "bash --help" isn't localized on Mac OS X. + +2015-06-24 Daiki Ueno <[email protected]> + * 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>. diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash index f2e0e3b..7c74651 100755 --- a/gettext-tools/tests/lang-bash +++ b/gettext-tools/tests/lang-bash @@ -116,6 +116,19 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then exit 77 fi +case "$host_os" in + darwin*) + if test $LOCALE_FR != none; then + LC_ALL=$LOCALE_FR bash --help \ + | grep '^Utilisation' > /dev/null 2>&1 || exit 77 + fi + if test $LOCALE_FR_UTF8 != none; then + LC_ALL=$LOCALE_FR_UTF8 bash --help \ + | grep '^Utilisation' > /dev/null 2>&1 || exit 77 + fi + ;; +esac + # Expected result when bash is built without i18n support. cat <<\EOF > prog.nok 'Your command, please?', asked the waiter. -- 2.4.2
