parse-options: make OPT_ARGUMENT() more useful

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 84366b262402c8eb38404e292b4a2fcd35e1ea5e..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
@@ -110,9 +111,10 @@ EOF
 }
 
 require_svnserve () {
-       if test -z "$SVNSERVE_PORT"
+       test_tristate GIT_TEST_SVNSERVE
+       if ! test "$GIT_TEST_SVNSERVE" = true
        then
-               skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
+               skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
                test_done
        fi
 }