Merge branch 'mg/maint-difftool-vim-readonly'

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 87945073b0de3411dd4d80ffd61aae4b63a06ba2..5a6a4b9b7a6e6abbb9570ddceaac68baf5c2690b 100755 (executable)
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -2,7 +2,7 @@
 
 test_description='check svn dumpfile importer'
 
-. ./lib-git-svn.sh
+. ./test-lib.sh
 
 reinit_git () {
        rm -fr .git &&
@@ -721,10 +721,22 @@ test_expect_success 'deltas for typechange' '
        test_cmp expect actual
 '
 
-test_expect_success 't9135/svn.dump' '
-       svnadmin create simple-svn &&
-       svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
-       svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
+
+test_expect_success 'set up svn repo' '
+       svnconf=$PWD/svnconf &&
+       mkdir -p "$svnconf" &&
+
+       if
+               svnadmin -h >/dev/null 2>&1 &&
+               svnadmin create simple-svn &&
+               svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+               svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
+       then
+               test_set_prereq SVNREPO
+       fi
+'
+
+test_expect_success SVNREPO 't9135/svn.dump' '
        git init simple-git &&
        test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
        (