Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation · Junio C Hamano <hidden>
- 2016-06-15 · [PATCH/RFC 1/7] i18n: mark init-db messages for translation · Ævar Arnfjörð Bjarmason <hidden>
- 2016-06-15 · Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation · Junio C Hamano <hidden>
Junio C Hamano [off-list ref] writes:
By the way, don't you think the attached is far easier to read than artificially breaking a single test into "do" and "check" phase? The majority of the l10n dependent tests can and should lose C_LOCALE_OUTPUT prerequisite and use this instead for far superiour readability, I think. At least this makes it far more pleasant to read both the actual script and the output in non-poison cases.
And this is for the other common pattern: use grep to find expected string. t/test-lib.sh | 8 ++++++++ t/t0001-init.sh | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3e7c2bb..b764acb 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -1085,6 +1085,14 @@ test_i18ncmp () { test -n "$GETTEXT_POISON" || test_cmp "$@" } +# Use this instead of "grep expected-string actual" to see if the +# output from a git command that acn be translated contains an +# expected string. When running under GETTEXT_POISON this pretends +# that the command produced expected results. +test_i18ngrep () { + test -n "$GETTEXT_POISON" || grep "$@" +} + # test whether the filesystem supports symbolic links ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS rm -f y
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index a5816d0..651e098 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh@@ -180,7 +180,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' ' fi ' -test_expect_success C_LOCALE_OUTPUT 'reinit' ' +test_expect_success 'reinit' ' ( sane_unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG &&
@@ -190,11 +190,11 @@ test_expect_success C_LOCALE_OUTPUT 'reinit' ' git init >out1 2>err1 && git init >out2 2>err2 ) && - grep "Initialized empty" again/out1 && - grep "Reinitialized existing" again/out2 && + test_i18ngrep "Initialized empty" again/out1 && + test_i18ngrep "Reinitialized existing" again/out2 && >again/empty && - test_cmp again/empty again/err1 && - test_cmp again/empty again/err2 + test_i18ncmp again/empty again/err1 && + test_i18ncmp again/empty again/err2 ' test_expect_success 'init with --template' '