diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
| commit | 2488849c7e76bed9069ba052a186b88214450cca (patch) | |
| tree | 3c311a81ddd52a91e8ee03f4b9addbc4d696b470 /t/test-lib-functions.sh | |
| parent | Merge branch 'dd/poll-dot-h' (diff) | |
| parent | tests: explicitly use `git.exe` on Windows (diff) | |
| download | tgif-2488849c7e76bed9069ba052a186b88214450cca.tar.xz | |
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/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 4397c01be0..b4e391526a 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -923,7 +923,8 @@ test_create_repo () { mkdir -p "$repo" ( cd "$repo" || error "Cannot setup test environment" - "$GIT_EXEC_PATH/git-init" "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 || + "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" init \ + "--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 || error "cannot run git init -- have you built things yet?" mv .git/hooks .git/hooks-disabled ) || exit |