mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'jk/gettext-poison'
Test updates. * jk/gettext-poison: git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME t0205: drop redundant test
This commit is contained in:
commit
ac0a57c0bd
|
@ -17,15 +17,15 @@ export TEXTDOMAINDIR
|
|||
|
||||
# First decide what scheme to use...
|
||||
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
|
||||
if test -n "@@USE_GETTEXT_SCHEME@@"
|
||||
if test -n "$GIT_GETTEXT_POISON"
|
||||
then
|
||||
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
|
||||
elif test -n "@@USE_GETTEXT_SCHEME@@"
|
||||
then
|
||||
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
|
||||
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
|
||||
then
|
||||
: no probing necessary
|
||||
elif test -n "$GIT_GETTEXT_POISON"
|
||||
then
|
||||
GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
|
||||
elif type gettext.sh >/dev/null 2>&1
|
||||
then
|
||||
# GNU libintl's gettext.sh
|
||||
|
|
|
@ -7,10 +7,6 @@ test_description='Gettext Shell poison'
|
|||
|
||||
. ./lib-gettext.sh
|
||||
|
||||
test_expect_success GETTEXT_POISON "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
|
||||
test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
|
||||
'
|
||||
|
||||
test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
|
||||
test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue