From 309a9e33731a56487944dbaa00073f8ee05c9f70 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 May 2015 09:06:14 -0700 Subject: [PATCH] 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 --- Makefile | 1 + t/lib-httpd.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Makefile b/Makefile index e0caec3f67..b9ebbf619e 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 872a252d58..d823664c57 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 -- 2.11.4.GIT