Skip to content

Commit 2be6ccc

Browse files
committed
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
2 parents cf861cd + 3960290 commit 2be6ccc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ linux-clang|linux-gcc)
160160
export CC=gcc-8
161161
fi
162162

163-
export GIT_TEST_HTTPD=YesPlease
163+
export GIT_TEST_HTTPD=true
164164

165165
# The Linux build installs the defined dependency versions below.
166166
# The OS X build installs much more recent versions, whichever

t/lib-git-svn.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ svn_cmd () {
6969
maybe_start_httpd () {
7070
loc=${1-svn}
7171

72-
if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD
72+
if git env--helper --type=bool --default=false --exit-code GIT_TEST_SVN_HTTPD
7373
then
7474
. "$TEST_DIRECTORY"/lib-httpd.sh
7575
LIB_HTTPD_SVN="$loc"

0 commit comments

Comments
 (0)