mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
Change the GIT_TEST_GETTEXT_POISON variable from being "non-empty?" to
being a more standard boolean variable.
Since it needed to be checked in both C code and shellscript (via test
-n) it was one of the remaining shellscript-like variables. Now that
we have "env--helper" we can change that.
There's a couple of tricky edge cases that arise because we're using
git_env_bool() early, and the config-reading "env--helper".
If GIT_TEST_GETTEXT_POISON is set to an invalid value die_bad_number()
will die, but to do so it would usually call gettext(). Let's detect
the special case of GIT_TEST_GETTEXT_POISON and always emit that
message in the C locale, lest we infinitely loop.
As seen in the updated tests in t0017-env-helper.sh there's also a
caveat related to "env--helper" needing to read the config for trace2
purposes.
Since the C_LOCALE_OUTPUT prerequisite is lazy and relies on
"env--helper" we could get invalid results if we failed to read the
config (e.g. because we'd loop on includes) when combined with
e.g. "test_i18ngrep" wanting to check with "env--helper" if
GIT_TEST_GETTEXT_POISON was true or not.
I'm crossing my fingers and hoping that a test similar to the one I
removed in the earlier "config tests: simplify include cycle test"
change in this series won't happen again, and testing for this
explicitly in "env--helper"'s own tests.
This change breaks existing uses of
e.g. GIT_TEST_GETTEXT_POISON=YesPlease, which we've documented in
po/README and other places. As noted in [1] we might want to consider
also accepting "YesPlease" in "env--helper" as a special-case.
But as the lack of uproar over 6cdccfce1e
("i18n: make GETTEXT_POISON
a runtime option", 2018-11-08) demonstrates the audience for this
option is a really narrow set of git developers, who shouldn't have
much trouble modifying their test scripts, so I think it's better to
deal with that minor headache now and make all the relevant GIT_TEST_*
variables boolean in the same way than carry the "YesPlease"
special-case forward.
1. https://public-inbox.org/git/xmqqtvckm3h8.fsf@gitster-ct.c.googlers.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
1.2 KiB
Bash
Executable file
40 lines
1.2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
|
|
#
|
|
|
|
test_description='Gettext Shell poison'
|
|
|
|
GIT_TEST_GETTEXT_POISON=true
|
|
export GIT_TEST_GETTEXT_POISON
|
|
. ./lib-gettext.sh
|
|
|
|
test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
|
|
test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
|
|
'
|
|
|
|
test_expect_success 'gettext: our gettext() fallback has poison semantics' '
|
|
printf "# GETTEXT POISON #" >expect &&
|
|
gettext "test" >actual &&
|
|
test_cmp expect actual &&
|
|
printf "# GETTEXT POISON #" >expect &&
|
|
gettext "test more words" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'eval_gettext: our eval_gettext() fallback has poison semantics' '
|
|
printf "# GETTEXT POISON #" >expect &&
|
|
eval_gettext "test" >actual &&
|
|
test_cmp expect actual &&
|
|
printf "# GETTEXT POISON #" >expect &&
|
|
eval_gettext "test more words" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "gettext: invalid GIT_TEST_GETTEXT_POISON value doesn't infinitely loop" "
|
|
test_must_fail env GIT_TEST_GETTEXT_POISON=xyz git version 2>error &&
|
|
grep \"fatal: bad numeric config value 'xyz' for 'GIT_TEST_GETTEXT_POISON': invalid unit\" error
|
|
"
|
|
|
|
test_done
|