diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:33 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 01:48:33 +0300 |
commit | 466f94ec45e6170730f9dfaf7185a26f2e9fa8bf (patch) | |
tree | 94c611b389a658d7581175b8ac4407e6f6ac79fb /t/test-lib-functions.sh | |
parent | 59ace284f33fe9928fcdb04b02044c921fd6905e (diff) | |
parent | 73c01d25fe254208befe099a659916d2bff5bbb4 (diff) |
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-functions.sh')
-rw-r--r-- | t/test-lib-functions.sh | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index aca17f8945..07976af81c 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1016,19 +1016,16 @@ test_cmp_bin () { cmp "$@" } -# Use this instead of test_cmp to compare files that contain expected and -# actual output from git commands that can be translated. When running -# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected -# results. +# Wrapper for test_cmp which 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_i18ncmp () { - ! test_have_prereq C_LOCALE_OUTPUT || test_cmp "$@" + test_cmp "$@" } -# Use this instead of "grep expected-string actual" to see if the -# output from a git command that can be translated either contains an -# expected string, or does not contain an unwanted one. When running -# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected -# results. +# Wrapper for grep which 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_i18ngrep () { eval "last_arg=\${$#}" @@ -1041,12 +1038,6 @@ test_i18ngrep () { BUG "too few parameters to test_i18ngrep" fi - if test_have_prereq !C_LOCALE_OUTPUT - then - # pretend success - return 0 - fi - if test "x!" = "x$1" then shift |