summaryrefslogtreecommitdiff
path: root/t/t9115-git-svn-dcommit-funky-renames.sh
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-07-23 04:26:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-25 17:42:34 (GMT)
commita8a5d2511871caec259036af95d7dd6287d12925 (patch)
tree9e3e9e21f963acfa9dfa18b3f5868233c9356b9c /t/t9115-git-svn-dcommit-funky-renames.sh
parent7b232add79b5d95a1f5dbdf72eeb8fa9a6b92a56 (diff)
downloadgit-a8a5d2511871caec259036af95d7dd6287d12925.zip
git-a8a5d2511871caec259036af95d7dd6287d12925.tar.gz
git-a8a5d2511871caec259036af95d7dd6287d12925.tar.bz2
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/t9115-git-svn-dcommit-funky-renames.sh')
-rwxr-xr-xt/t9115-git-svn-dcommit-funky-renames.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index a87d3d3..64bb495 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -8,9 +8,10 @@ test_description='git svn dcommit can commit renames of files with ugly names'
. ./lib-git-svn.sh
test_expect_success 'load repository with strange names' '
- svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9115/funky-names.dump &&
- start_httpd gtk+
- '
+ svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+'
+
+maybe_start_httpd gtk+
test_expect_success 'init and fetch repository' '
git svn init "$svnrepo" &&