diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:44 -0700 |
| commit | 8087a620863dde1c589f072abd4e6b9ef1017a62 (patch) | |
| tree | f90fa9e990232e691a39499bf5b87c5afa7a13c0 /Makefile | |
| parent | Merge branch 'dl/subtree-push-no-squash' (diff) | |
| parent | tests: skip dav http-push tests under NO_EXPAT=NoThanks (diff) | |
| download | tgif-8087a620863dde1c589f072abd4e6b9ef1017a62.tar.xz | |
Merge branch 'jk/skip-http-tests-under-no-curl'
Test clean-up.
* jk/skip-http-tests-under-no-curl:
tests: skip dav http-push tests under NO_EXPAT=NoThanks
t/lib-httpd.sh: skip tests if NO_CURL is defined
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2108,6 +2108,7 @@ GIT-BUILD-OPTIONS: FORCE @echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ + @echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@ @echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@ |