Skip to content

Commit 6a20b62

Browse files
szedergitster
authored andcommitted
t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
Once upon a time the GIT_SVN_TEST_HTTPD environment variable needed to be set to enable SVN HTTP tests [1]. Then 3b072c5 (tests: replace test_tristate with "git env--helper", 2019-06-21) came along, and attempted to turn GIT_SVN_TEST_HTTPD into a bool, but while doing so it mistyped the variable name, and started to check GIT_TEST_HTTPD instead. Consequently, if someone explicitly set GIT_TEST_HTTPD to true and has only the general 'git-svn' dependencies installed but not the Subversion server modules for Apache (libapache2-mod-svn), then a couple of 'git-svn' tests fail, because they can't start httpd due to the missing module. We could simply fix this by checking the GIT_SVN_TEST_HTTPD variablewith 'git env--helper', but notice that the name of this variable doesn't conform to our usual GIT_TEST_* convention. So let's check the GIT_TEST_SVN_HTTPD instead. [1] a8a5d25 (git svn: migrate tests to use lib-httpd, 2016-07-23) Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5fa0f52 commit 6a20b62

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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)