summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:34 (GMT)
commit612c3dfb06675bf65831a7eb8b51ecc57224f5ef (patch)
tree469b2b41af3ac67016fccdf2d0adf420dfb14dd4 /t/lib-httpd
parent3819fb9ab4c80e5fea3a7b31703a3884f47c8a83 (diff)
parenta8a5d2511871caec259036af95d7dd6287d12925 (diff)
downloadgit-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.zip
git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.gz
git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.bz2
Merge branch 'ew/git-svn-http-tests'
Tests for "git svn" have been taught to reuse the lib-httpd test infrastructure when testing the subversion integration that interacts with subversion repositories served over the http:// protocol. * ew/git-svn-http-tests: git svn: migrate tests to use lib-httpd t/t91*: do not say how to avoid the tests
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 018a83a..c3e6313 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -208,8 +208,8 @@ RewriteRule ^/half-auth-complete/ - [E=AUTHREQUIRED:yes]
<IfDefine SVN>
LoadModule dav_svn_module modules/mod_dav_svn.so
- <Location /svn>
+ <Location /${LIB_HTTPD_SVN}>
DAV svn
- SVNPath svnrepo
+ SVNPath "${LIB_HTTPD_SVNPATH}"
</Location>
</IfDefine>