Merge branch 'sg/git-test-boolean'
Fix an earlier regression in the test suite, which mistakenly stopped running HTTPD tests. * sg/git-test-boolean: ci: restore running httpd tests t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
This commit is contained in:
commit
2be6ccc01a
@ -160,7 +160,7 @@ linux-clang|linux-gcc)
|
||||
export CC=gcc-8
|
||||
fi
|
||||
|
||||
export GIT_TEST_HTTPD=YesPlease
|
||||
export GIT_TEST_HTTPD=true
|
||||
|
||||
# The Linux build installs the defined dependency versions below.
|
||||
# The OS X build installs much more recent versions, whichever
|
||||
|
@ -69,7 +69,7 @@ svn_cmd () {
|
||||
maybe_start_httpd () {
|
||||
loc=${1-svn}
|
||||
|
||||
if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD
|
||||
if git env--helper --type=bool --default=false --exit-code GIT_TEST_SVN_HTTPD
|
||||
then
|
||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||
LIB_HTTPD_SVN="$loc"
|
||||
|
Loading…
Reference in New Issue
Block a user