diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-19 07:24:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 07:24:39 (GMT) |
| commit | 954932667dac15885165cdb579acbf6a774fe140 (patch) | |
| tree | 73d9e230929da6c9ffcb17ac6a52516a7ff32e3f /ci | |
| parent | 0e94dab5be2fd17cfba634f8a29ba5461d2cbd9e (diff) | |
| parent | c6a9a30e6a01b4d5329d796b800ab0917b963b20 (diff) | |
| download | git-954932667dac15885165cdb579acbf6a774fe140.zip git-954932667dac15885165cdb579acbf6a774fe140.tar.gz git-954932667dac15885165cdb579acbf6a774fe140.tar.bz2 | |
Merge branch 'ab/dynamic-gettext-poison'
Our testing framework uses a special i18n "poisoned localization"
feature to find messages that ought to stay constant but are
incorrectly marked to be translated. This feature has been made
into a runtime option (it used to be a compile-time option).
* ab/dynamic-gettext-poison:
Makefile: ease dynamic-gettext-poison transition
i18n: make GETTEXT_POISON a runtime option
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lib-travisci.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 06970f7..69dff4d 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -123,7 +123,7 @@ osx-clang|osx-gcc) # Travis CI OS X export GIT_SKIP_TESTS="t9810 t9816" ;; -GETTEXT_POISON) - export GETTEXT_POISON=YesPlease +GIT_TEST_GETTEXT_POISON) + export GIT_TEST_GETTEXT_POISON=YesPlease ;; esac |