Merge branch 'jc/maint-read-tree-multi'

[git.git] / t / lib-git-svn.sh

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index de384e6ac3a125e59156abbf897a3371f736bbfa..773d47cf3cb704d7976185738a2b9840c159a33c 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -7,7 +7,10 @@ if test -n "$NO_SVN_TESTS"
 then
        say 'skipping git svn tests, NO_SVN_TESTS defined'
        test_done
-       exit
+fi
+if ! test_have_prereq PERL; then
+       say 'skipping git svn tests, perl not available'
+       test_done
 fi
 
 GIT_DIR=$PWD/.git
@@ -19,7 +22,6 @@ if test $? -ne 1
 then
     say 'skipping git svn tests, svn not found'
     test_done
-    exit
 fi
 
 svnrepo=$PWD/svnrepo
@@ -43,7 +45,6 @@ then
        fi
        say "$err"
        test_done
-       exit
 fi
 
 rawsvnrepo="$svnrepo"
@@ -144,7 +145,6 @@ require_svnserve () {
     then
         say 'skipping svnserve test. (set $SVNSERVE_PORT to enable)'
         test_done
-        exit
     fi
 }