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

diff --git a/ci/lib.sh b/ci/lib.sh
index 44db2d5cbb2241c7bd3ffd69d15a73c1fd4357ae..29dc740d4037c4604b0afcff77cb355baaf74e80 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -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

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 5d4ae629e14e668279a559527876685689cae61c..bc0b9c71f824dd31984d05ef8e39bb48fade2db6 100644 (file)
--- 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"