From a8a5d2511871caec259036af95d7dd6287d12925 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 23 Jul 2016 04:26:08 +0000 Subject: 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 Cc: Michael J Gruber Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- t/t9115-git-svn-dcommit-funky-renames.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 't/t9115-git-svn-dcommit-funky-renames.sh') diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh index a87d3d3fc1..64bb495834 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" && -- cgit v1.2.3