Skip to content

Commit 309a9e3

Browse files
committed
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 <[email protected]>
1 parent c9d441a commit 309a9e3

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,6 +2188,7 @@ GIT-BUILD-OPTIONS: FORCE
21882188
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
21892189
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
21902190
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
2191+
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@
21912192
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
21922193
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
21932194
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@

t/lib-httpd.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ then
3636
test_done
3737
fi
3838

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+
3945
test_tristate GIT_TEST_HTTPD
4046
if test "$GIT_TEST_HTTPD" = false
4147
then

0 commit comments

Comments
 (0)