diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:28 (GMT) |
| commit | c538004ccb643388020b0e362409e469ed50d054 (patch) | |
| tree | cebd029e483ae1b703045d0f337e38514d85e061 /Makefile | |
| parent | e41f8d98e37643909e22317f2ffdd940b953af55 (diff) | |
| parent | 309a9e33731a56487944dbaa00073f8ee05c9f70 (diff) | |
| download | git-c538004ccb643388020b0e362409e469ed50d054.zip git-c538004ccb643388020b0e362409e469ed50d054.tar.gz git-c538004ccb643388020b0e362409e469ed50d054.tar.bz2 | |
Merge branch 'jk/skip-http-tests-under-no-curl' into maint
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
@@ -2102,6 +2102,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)))'\' >>$@ |