diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-19 10:24:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 10:24:41 +0300 |
| commit | 2488849c7e76bed9069ba052a186b88214450cca (patch) | |
| tree | 3c311a81ddd52a91e8ee03f4b9addbc4d696b470 /t/lib-gettext.sh | |
| parent | 1c6e646235f5442bafcf303e3ed6a083efd3e0e0 (diff) | |
| parent | 8abfdf44c882ad5d31bd8d0a0f1bfb67f8a9e39f (diff) | |
Merge branch 'js/test-git-installed'
Update the "test installed Git" mode of our test suite to work better.
* js/test-git-installed:
tests: explicitly use `git.exe` on Windows
tests: do not require Git to be built when testing an installed Git
t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set
tests: respect GIT_TEST_INSTALLED when initializing repositories
tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/
Diffstat (limited to 't/lib-gettext.sh')
| -rw-r--r-- | t/lib-gettext.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh index 755f421431..2139b427ca 100644 --- a/t/lib-gettext.sh +++ b/t/lib-gettext.sh @@ -10,7 +10,12 @@ GIT_TEXTDOMAINDIR="$GIT_BUILD_DIR/po/build/locale" GIT_PO_PATH="$GIT_BUILD_DIR/po" export GIT_TEXTDOMAINDIR GIT_PO_PATH -. "$GIT_BUILD_DIR"/git-sh-i18n +if test -n "$GIT_TEST_INSTALLED" +then + . "$(git --exec-path)"/git-sh-i18n +else + . "$GIT_BUILD_DIR"/git-sh-i18n +fi if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT then |