diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-20 17:20:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 17:20:45 -0800 |
| commit | 5b85143ba548c6c0c35df5e606ee3568c55ca0da (patch) | |
| tree | 9602d237fafa8193274134dd5a5d4070ad43c4ed /t/lib-git-svn.sh | |
| parent | ce0545455a09113a8ece8f80c87ec61110569940 (diff) | |
| parent | 3289e86e1eb4f38b5c8dfd2f44b4486d2755d6d6 (diff) | |
| download | git-5b85143ba548c6c0c35df5e606ee3568c55ca0da.tar.gz | |
Merge branch 'ew/svn-pm'
* ew/svn-pm:
git-svn: rename 'commit' command to 'set-tree'
git-svn: remove support for the svn command-line client
git-svn: convert to using Git.pm
Diffstat (limited to 't/lib-git-svn.sh')
| -rw-r--r-- | t/lib-git-svn.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 63c670304f..99ada71349 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -7,17 +7,18 @@ then exit fi -GIT_DIR=$PWD/.git -GIT_SVN_DIR=$GIT_DIR/svn/git-svn -SVN_TREE=$GIT_SVN_DIR/svn-tree - -perl -e 'use SVN::Core' >/dev/null 2>&1 +perl -e 'use SVN::Core; $SVN::Core::VERSION gt "1.1.0" or die' >/dev/null 2>&1 if test $? -ne 0 then - echo 'Perl SVN libraries not found, tests requiring those will be skipped' - GIT_SVN_NO_LIB=1 + test_expect_success 'Perl SVN libraries not found, skipping test' : + test_done + exit fi +GIT_DIR=$PWD/.git +GIT_SVN_DIR=$GIT_DIR/svn/git-svn +SVN_TREE=$GIT_SVN_DIR/svn-tree + svnadmin >/dev/null 2>&1 if test $? -ne 1 then |