diff options
author | Eric Wong <e@80x24.org> | 2016-07-23 04:26:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 10:42:34 -0700 |
commit | a8a5d2511871caec259036af95d7dd6287d12925 (patch) | |
tree | 9e3e9e21f963acfa9dfa18b3f5868233c9356b9c /t/lib-httpd.sh | |
parent | 7b232add79b5d95a1f5dbdf72eeb8fa9a6b92a56 (diff) | |
download | git-a8a5d2511871caec259036af95d7dd6287d12925.tar.gz git-a8a5d2511871caec259036af95d7dd6287d12925.tar.xz |
git svn: migrate tests to use lib-httpd
This allows us to use common test infrastructure and parallelize
the tests. For now, GIT_SVN_TEST_HTTPD=true needs to be set to
enable the SVN HTTP tests because we reuse the same test cases
for both file:// and http:// SVN repositories. SVN_HTTPD_PORT
is no longer honored.
Tested under Apache 2.2 and 2.4 on Debian 7.x (wheezy) and
8.x (jessie), respectively.
Cc: Clemens Buchacher <drizzd@aon.at>
Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 f9f3e5fd8..ad87e2b9f 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 } |