diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:48:34 -0700 |
| commit | 612c3dfb06675bf65831a7eb8b51ecc57224f5ef (patch) | |
| tree | 469b2b41af3ac67016fccdf2d0adf420dfb14dd4 /t/t9115-git-svn-dcommit-funky-renames.sh | |
| parent | 3819fb9ab4c80e5fea3a7b31703a3884f47c8a83 (diff) | |
| parent | a8a5d2511871caec259036af95d7dd6287d12925 (diff) | |
| download | git-612c3dfb06675bf65831a7eb8b51ecc57224f5ef.tar.gz | |
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/t9115-git-svn-dcommit-funky-renames.sh')
| -rwxr-xr-x | t/t9115-git-svn-dcommit-funky-renames.sh | 7 |
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 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" && |