mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jk/skip-http-tests-under-no-curl'
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
This commit is contained in:
commit
8087a62086
1
Makefile
1
Makefile
|
@ -2108,6 +2108,7 @@ GIT-BUILD-OPTIONS: FORCE
|
||||||
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
|
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
|
||||||
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
|
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
|
||||||
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
|
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
|
||||||
|
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@
|
||||||
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
|
@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
|
||||||
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
|
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
|
||||||
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
|
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
|
||||||
|
|
|
@ -30,6 +30,18 @@
|
||||||
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
|
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if test -n "$NO_CURL"
|
||||||
|
then
|
||||||
|
skip_all='skipping test, git built without http support'
|
||||||
|
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
|
test_tristate GIT_TEST_HTTPD
|
||||||
if test "$GIT_TEST_HTTPD" = false
|
if test "$GIT_TEST_HTTPD" = false
|
||||||
then
|
then
|
||||||
|
|
|
@ -3,12 +3,6 @@
|
||||||
test_description='fetch/clone from a shallow clone over http'
|
test_description='fetch/clone from a shallow clone over http'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
skip_all='skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,6 @@
|
||||||
test_description='test smart pushing over http via http-backend'
|
test_description='test smart pushing over http via http-backend'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
skip_all='skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
ROOT_PATH="$PWD"
|
ROOT_PATH="$PWD"
|
||||||
. "$TEST_DIRECTORY"/lib-gpg.sh
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
|
|
|
@ -3,12 +3,6 @@
|
||||||
test_description='push from/to a shallow clone over http'
|
test_description='push from/to a shallow clone over http'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
say 'skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,6 @@
|
||||||
|
|
||||||
test_description='test dumb fetching over http via static file'
|
test_description='test dumb fetching over http via static file'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
skip_all='skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,6 @@
|
||||||
|
|
||||||
test_description='test smart fetching over http via http-backend'
|
test_description='test smart fetching over http via http-backend'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
skip_all='skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,6 @@
|
||||||
|
|
||||||
test_description='test git-http-backend'
|
test_description='test git-http-backend'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
if test -n "$NO_CURL"; then
|
|
||||||
skip_all='skipping test, git built without http support'
|
|
||||||
test_done
|
|
||||||
fi
|
|
||||||
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue