diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
| commit | 2be6ccc01a93a96aa4a462921e15e69ed56b0792 (patch) | |
| tree | cfb23ff0d971ae46c3de401dfbeea052f6884394 | |
| parent | Merge branch 'rs/get-tagged-oid' (diff) | |
| parent | ci: restore running httpd tests (diff) | |
| download | tgif-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
| -rwxr-xr-x | ci/lib.sh | 2 | ||||
| -rw-r--r-- | t/lib-git-svn.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 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" |