diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:33 -0800 |
| commit | 466f94ec45e6170730f9dfaf7185a26f2e9fa8bf (patch) | |
| tree | 94c611b389a658d7581175b8ac4407e6f6ac79fb /t/test-lib.sh | |
| parent | 59ace284f33fe9928fcdb04b02044c921fd6905e (diff) | |
| parent | 73c01d25fe254208befe099a659916d2bff5bbb4 (diff) | |
| download | git-466f94ec45e6170730f9dfaf7185a26f2e9fa8bf.tar.gz | |
Merge branch 'ab/detox-gettext-tests'
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* ab/detox-gettext-tests:
tests: remove uses of GIT_TEST_GETTEXT_POISON=false
tests: remove support for GIT_TEST_GETTEXT_POISON
ci: remove GETTEXT_POISON jobs
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 4bfa7f74ae..431adba0fb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -404,15 +404,6 @@ TZ=UTC export LANG LC_ALL PAGER TZ EDITOR=: -# GIT_TEST_GETTEXT_POISON should not influence git commands executed -# during initialization of test-lib and the test repo. Back it up, -# unset and then restore after initialization is finished. -if test -n "$GIT_TEST_GETTEXT_POISON" -then - GIT_TEST_GETTEXT_POISON_ORIG=$GIT_TEST_GETTEXT_POISON - unset GIT_TEST_GETTEXT_POISON -fi - # A call to "unset" with no arguments causes at least Solaris 10 # /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets # deriving from the command substitution clustered with the other @@ -1528,16 +1519,10 @@ test -n "$USE_LIBPCRE2" && test_set_prereq PCRE test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT -if test -n "$GIT_TEST_GETTEXT_POISON_ORIG" -then - GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG - export GIT_TEST_GETTEXT_POISON - unset GIT_TEST_GETTEXT_POISON_ORIG -fi - -test_lazy_prereq C_LOCALE_OUTPUT ' - ! test_bool_env GIT_TEST_GETTEXT_POISON false -' +# Used to be used for GIT_TEST_GETTEXT_POISON=false. Only here as a +# shim for other in-flight changes. Should not be used and will be +# removed soon. +test_set_prereq C_LOCALE_OUTPUT if test -z "$GIT_TEST_CHECK_CACHE_TREE" then |