mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/detox-gettext-tests'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-02-10 14:48:33 -08:00
parent 59ace284f3 73c01d25fe
commit 466f94ec45
22 changed files with 29 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
t/test-lib-functions.sh
View File

@ -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