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>
Junio C Hamano committed
May 7, 2015 at 09:06 UTC
309a9e33731a56487944dbaa00073f8ee05c9f70
2 files changed
+7
Makefile
+1
@@ -2188,6 +2188,7 @@ GIT-BUILD-OPTIONS: FORCE
2188
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
2189
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
2190
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
2191
+ @echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@
2192
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
2193
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
2194
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
t/lib-httpd.sh
+6
@@ -36,6 +36,12 @@ then
36
test_done
37
fi
38
39
+if test -n "$NO_EXPAT" && test -n "$LIB_HTTPD_DAV"
40
+then
41
+ skip_all='skipping test, git built without expat support'
42
+ test_done
43
+fi
44
+
45
test_tristate GIT_TEST_HTTPD
46
if test "$GIT_TEST_HTTPD" = false
47
then