summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-30 13:19:29 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-30 13:19:29 +0900
commit2be6ccc01a93a96aa4a462921e15e69ed56b0792 (patch)
treecfb23ff0d971ae46c3de401dfbeea052f6884394 /t
parentMerge branch 'rs/get-tagged-oid' (diff)
parentci: restore running httpd tests (diff)
downloadtgif-2be6ccc01a93a96aa4a462921e15e69ed56b0792.tar.xz
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
Diffstat (limited to 't')
-rw-r--r--t/lib-git-svn.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 5d4ae629e1..bc0b9c71f8 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -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"