mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
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:
commit
deeb2fce08
|
@ -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 () {
|
||||
|
|
Loading…
Reference in a new issue