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
This commit is contained in:
Junio C Hamano 2017-12-28 14:08:46 -08:00
commit deeb2fce08

View file

@ -17,8 +17,8 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree
svn >/dev/null 2>&1 svn >/dev/null 2>&1
if test $? -ne 1 if test $? -ne 1
then then
skip_all='skipping git svn tests, svn not found' skip_all='skipping git svn tests, svn not found'
test_done test_done
fi fi
svnrepo=$PWD/svnrepo svnrepo=$PWD/svnrepo
@ -110,18 +110,20 @@ EOF
} }
require_svnserve () { require_svnserve () {
if test -z "$SVNSERVE_PORT" test_tristate GIT_TEST_SVNSERVE
then if ! test "$GIT_TEST_SVNSERVE" = true
skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)' then
test_done skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
fi test_done
fi
} }
start_svnserve () { start_svnserve () {
svnserve --listen-port $SVNSERVE_PORT \ SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}}
--root "$rawsvnrepo" \ svnserve --listen-port $SVNSERVE_PORT \
--listen-once \ --root "$rawsvnrepo" \
--listen-host 127.0.0.1 & --listen-once \
--listen-host 127.0.0.1 &
} }
prepare_a_utf8_locale () { prepare_a_utf8_locale () {