diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-12-31 21:49:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-31 23:40:52 -0800 |
| commit | c6d499a82fbb02e2a03fe3d858ff144fa570fb34 (patch) | |
| tree | a692d9a15961ba33f8c478c9c1ecbda3aebf1888 | |
| parent | e90068a9046ccaf0bed82fd180b4748edbd5659a (diff) | |
| download | git-c6d499a82fbb02e2a03fe3d858ff144fa570fb34.tar.gz git-c6d499a82fbb02e2a03fe3d858ff144fa570fb34.tar.xz | |
git-svn: remove svnadmin dependency from the tests
We require the libraries now, so we can create repositories
using them (and save some executable load time while we're at
it).
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | t/lib-git-svn.sh | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 99ada7134..af42ccc8d 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -7,26 +7,10 @@ then exit fi -perl -e 'use SVN::Core; $SVN::Core::VERSION gt "1.1.0" or die' >/dev/null 2>&1 -if test $? -ne 0 -then - 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 - test_expect_success 'skipping git-svn tests, svnadmin not found' : - test_done - exit -fi - svn >/dev/null 2>&1 if test $? -ne 1 then @@ -37,13 +21,24 @@ fi svnrepo=$PWD/svnrepo -set -e - -if svnadmin create --help | grep fs-type >/dev/null +perl -w -e " +use SVN::Core; +use SVN::Repos; +\$SVN::Core::VERSION gt '1.1.0' or exit(42); +SVN::Repos::create('$svnrepo', undef, undef, undef, + { 'fs-config' => 'fsfs'}); +" +x=$? +if test $x -ne 0 then - svnadmin create --fs-type fsfs "$svnrepo" -else - svnadmin create "$svnrepo" + if test $x -eq 42; then + err='Perl SVN libraries must be >= 1.1.0' + else + err='Perl SVN libraries not found or unusable, skipping test' + fi + test_expect_success "$err" : + test_done + exit fi svnrepo="file://$svnrepo" |