mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/git-test-boolean'

Browse Source 
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:
Junio C Hamano
2019-09-30 13:19:29 +09:00
parent cf861cd7a0 3960290675
commit 2be6ccc01a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/lib.sh
View File

@ -160,7 +160,7 @@ linux-clang|linux-gcc)
export CC=gcc-8 export CC=gcc-8
fi fi
export GIT_TEST_HTTPD=YesPlease export GIT_TEST_HTTPD=true
# The Linux build installs the defined dependency versions below. # The Linux build installs the defined dependency versions below.
# The OS X build installs much more recent versions, whichever # The OS X build installs much more recent versions, whichever

2
t/lib-git-svn.sh
View File

@ -69,7 +69,7 @@ svn_cmd () {
maybe_start_httpd () { maybe_start_httpd () {
loc=${1-svn} 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 then
. "$TEST_DIRECTORY"/lib-httpd.sh . "$TEST_DIRECTORY"/lib-httpd.sh
LIB_HTTPD_SVN="$loc" LIB_HTTPD_SVN="$loc"