Merge branch 'jk/autocrlf-overrides-eol-doc'

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 4c1f81f1678d83ab8b9ee7704d400bdd47ea70f7..f3b478c307c99397fb180fb3d5688e1d6f257904 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -13,6 +13,7 @@ fi
 GIT_DIR=$PWD/.git
 GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn
 SVN_TREE=$GIT_SVN_DIR/svn-tree
+test_set_port SVNSERVE_PORT
 
 svn >/dev/null 2>&1
 if test $? -ne 1
@@ -49,7 +50,7 @@ rawsvnrepo="$svnrepo"
 svnrepo="file://$svnrepo"
 
 poke() {
-       test-chmtime +1 "$1"
+       test-tool chmtime +1 "$1"
 }
 
 # We need this, because we should pass empty configuration directory to
@@ -119,7 +120,6 @@ require_svnserve () {
 }
 
 start_svnserve () {
-       SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}}
        svnserve --listen-port $SVNSERVE_PORT \
                 --root "$rawsvnrepo" \
                 --listen-once \