diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:46 -0800 |
| commit | deeb2fce083d75d8e2b5bafef4d96f48cc81c391 (patch) | |
| tree | c6ce602535da8e3331202d56ecd4aed3d1ed941b /t | |
| parent | Merge branch 'ew/svn-crlf' (diff) | |
| parent | t/lib-git-svn.sh: improve svnserve tests with parallel make test (diff) | |
| download | tgif-deeb2fce083d75d8e2b5bafef4d96f48cc81c391.tar.xz | |
Merge branch 'tz/lib-git-svn-svnserve-tests'
* tz/lib-git-svn-svnserve-tests:
t/lib-git-svn.sh: improve svnserve tests with parallel make test
t/lib-git-svn: cleanup inconsistent tab/space usage
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-git-svn.sh | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 688313ed5c..4c1f81f167 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -17,8 +17,8 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree svn >/dev/null 2>&1 if test $? -ne 1 then - skip_all='skipping git svn tests, svn not found' - test_done + skip_all='skipping git svn tests, svn not found' + test_done fi svnrepo=$PWD/svnrepo @@ -110,18 +110,20 @@ EOF } require_svnserve () { - if test -z "$SVNSERVE_PORT" - then - skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)' - test_done - fi + test_tristate GIT_TEST_SVNSERVE + if ! test "$GIT_TEST_SVNSERVE" = true + then + skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)' + test_done + fi } start_svnserve () { - svnserve --listen-port $SVNSERVE_PORT \ - --root "$rawsvnrepo" \ - --listen-once \ - --listen-host 127.0.0.1 & + SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}} + svnserve --listen-port $SVNSERVE_PORT \ + --root "$rawsvnrepo" \ + --listen-once \ + --listen-host 127.0.0.1 & } prepare_a_utf8_locale () { |