diff options
author | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-07 17:02:07 -0700 |
commit | 9673198ee867cea4ed70d2cf54c1a2eb8f27bb46 (patch) | |
tree | f06a5be02102b0a78f56e18beffa8fa5c3e70b6e /t/lib-git-svn.sh | |
parent | 96bc4de85cf810db5c7cd94bf0688a98a64a0bc7 (diff) | |
parent | 7c49cb288173ab5264b3b9e4257aeeb13388334c (diff) | |
download | git-9673198ee867cea4ed70d2cf54c1a2eb8f27bb46.tar.gz |
Merge branch 'master' into pb/gitpm
This is to resolve the conflicts with Ryan's annotate updates early.
Diffstat (limited to 't/lib-git-svn.sh')
-rw-r--r-- | t/lib-git-svn.sh | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh new file mode 100644 index 0000000000..29a1e72c61 --- /dev/null +++ b/t/lib-git-svn.sh @@ -0,0 +1,50 @@ +. ./test-lib.sh + +if test -n "$NO_SVN_TESTS" +then + test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' : + test_done + 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 +if test $? -ne 0 +then + echo 'Perl SVN libraries not found, tests requiring those will be skipped' + GIT_SVN_NO_LIB=1 +fi + +svnadmin >/dev/null 2>&1 +if test $? -ne 1 +then + test_expect_success 'skipping git-svn tests, svnadmin not found' : + test_done + exit +fi + +svn >/dev/null 2>&1 +if test $? -ne 1 +then + test_expect_success 'skipping git-svn tests, svn not found' : + test_done + exit +fi + +svnrepo=$PWD/svnrepo + +set -e + +if svnadmin create --help | grep fs-type >/dev/null +then + svnadmin create --fs-type fsfs "$svnrepo" +else + svnadmin create "$svnrepo" +fi + +svnrepo="file://$svnrepo/test-git-svn" + + |