summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-07 16:06:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-07 16:48:43 (GMT)
commit309a9e33731a56487944dbaa00073f8ee05c9f70 (patch)
tree8022cf012bc1a8b5e1406b13277aa53ffbe6bbaf
parentc9d441a899a96185cff7ca798dcf69af9825c2ff (diff)
downloadgit-309a9e33731a56487944dbaa00073f8ee05c9f70.zip
git-309a9e33731a56487944dbaa00073f8ee05c9f70.tar.gz
git-309a9e33731a56487944dbaa00073f8ee05c9f70.tar.bz2
tests: skip dav http-push tests under NO_EXPAT=NoThanks
When built with NO_EXPAT=NoThanks, we will not have a working http-push over webdav. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile1
-rw-r--r--t/lib-httpd.sh6
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e0caec3..b9ebbf6 100644
--- a/Makefile
+++ b/Makefile
@@ -2188,6 +2188,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)))'\' >>$@
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 872a252..d823664 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -36,6 +36,12 @@ then
test_done
fi
+if test -n "$NO_EXPAT" && test -n "$LIB_HTTPD_DAV"
+then
+ skip_all='skipping test, git built without expat support'
+ test_done
+fi
+
test_tristate GIT_TEST_HTTPD
if test "$GIT_TEST_HTTPD" = false
then