From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC 1/7] i18n: mark init-db messages for translation
Date: Tue, 12 Apr 2011 15:55:41 -0700 [thread overview]
Message-ID: <7v62qjnkpe.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vsjtnpc0k.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 12 Apr 2011 11:20:27 -0700")
Junio C Hamano <gitster@pobox.com> 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' '
next prev parent reply other threads:[~2011-04-12 22:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 19:34 [PATCH/RFC 0/7] i18n: mark missing C messages Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 1/7] i18n: mark init-db messages for translation Ævar Arnfjörð Bjarmason
2011-04-12 7:12 ` Junio C Hamano
2011-04-12 7:15 ` Junio C Hamano
2011-04-12 7:44 ` Ævar Arnfjörð Bjarmason
2011-04-12 18:20 ` Junio C Hamano
2011-04-12 22:55 ` Junio C Hamano [this message]
2011-04-12 23:04 ` Junio C Hamano
2011-04-14 20:56 ` [PATCH] i18n: use test_i18n{grep,cmp} in t7508 Junio C Hamano
2011-04-10 19:34 ` [PATCH/RFC 2/7] i18n: mark merge "Could not read from" message for translation Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 3/7] i18n: mark merge "upstream" messages " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 4/7] i18n: mark merge CHERRY_PICK_HEAD " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 5/7] i18n: mark clone nonexistent repository message " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 6/7] i18n: mark checkout --detach messages " Ævar Arnfjörð Bjarmason
2011-04-10 19:34 ` [PATCH/RFC 7/7] i18n: mark checkout plural warning " Ævar Arnfjörð Bjarmason
2011-04-12 7:19 ` Junio C Hamano
2011-04-12 7:54 ` Ævar Arnfjörð Bjarmason
2011-04-12 20:57 ` Junio C Hamano
2011-04-13 8:30 ` Ævar Arnfjörð Bjarmason
2011-04-13 15:55 ` Junio C Hamano
2011-04-12 7:27 ` [PATCH/RFC 0/7] i18n: mark missing C messages Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v62qjnkpe.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).