summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-19 07:24:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-19 07:24:41 (GMT)
commit2488849c7e76bed9069ba052a186b88214450cca (patch)
tree3c311a81ddd52a91e8ee03f4b9addbc4d696b470 /Makefile
parent1c6e646235f5442bafcf303e3ed6a083efd3e0e0 (diff)
parent8abfdf44c882ad5d31bd8d0a0f1bfb67f8a9e39f (diff)
downloadgit-2488849c7e76bed9069ba052a186b88214450cca.zip
git-2488849c7e76bed9069ba052a186b88214450cca.tar.gz
git-2488849c7e76bed9069ba052a186b88214450cca.tar.bz2
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d81a53a..af873ae 100644
--- a/Makefile
+++ b/Makefile
@@ -2592,6 +2592,7 @@ GIT-BUILD-OPTIONS: FORCE
@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
+ @echo X=\'$(X)\' >>$@+
ifdef TEST_OUTPUT_DIRECTORY
@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
endif