diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:48:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:48:34 +0200 |
| commit | 612c3dfb06675bf65831a7eb8b51ecc57224f5ef (patch) | |
| tree | 469b2b41af3ac67016fccdf2d0adf420dfb14dd4 /t/lib-httpd.sh | |
| parent | Merge branch 'js/t4130-rename-without-ino' (diff) | |
| parent | git svn: migrate tests to use lib-httpd (diff) | |
| download | git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.xz git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.zip | |
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.sh')
| -rw-r--r-- | t/lib-httpd.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index ac2cbee250..435a37465a 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -24,7 +24,7 @@ # LIB_HTTPD_MODULE_PATH web server modules path # LIB_HTTPD_PORT listening port # LIB_HTTPD_DAV enable DAV -# LIB_HTTPD_SVN enable SVN +# LIB_HTTPD_SVN enable SVN at given location (e.g. "svn") # LIB_HTTPD_SSL enable SSL # # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at> @@ -162,8 +162,10 @@ prepare_httpd() { if test -n "$LIB_HTTPD_SVN" then HTTPD_PARA="$HTTPD_PARA -DSVN" - rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo" - svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn" + LIB_HTTPD_SVNPATH="$rawsvnrepo" + svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/" + svnrepo="$svnrepo$LIB_HTTPD_SVN" + export LIB_HTTPD_SVN LIB_HTTPD_SVNPATH fi fi } |