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>
This commit is contained in:
parent
e90068a904
commit
c6d499a82f
@ -7,26 +7,10 @@ then
|
|||||||
exit
|
exit
|
||||||
fi
|
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_DIR=$PWD/.git
|
||||||
GIT_SVN_DIR=$GIT_DIR/svn/git-svn
|
GIT_SVN_DIR=$GIT_DIR/svn/git-svn
|
||||||
SVN_TREE=$GIT_SVN_DIR/svn-tree
|
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
|
svn >/dev/null 2>&1
|
||||||
if test $? -ne 1
|
if test $? -ne 1
|
||||||
then
|
then
|
||||||
@ -37,13 +21,24 @@ fi
|
|||||||
|
|
||||||
svnrepo=$PWD/svnrepo
|
svnrepo=$PWD/svnrepo
|
||||||
|
|
||||||
set -e
|
perl -w -e "
|
||||||
|
use SVN::Core;
|
||||||
if svnadmin create --help | grep fs-type >/dev/null
|
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
|
then
|
||||||
svnadmin create --fs-type fsfs "$svnrepo"
|
if test $x -eq 42; then
|
||||||
else
|
err='Perl SVN libraries must be >= 1.1.0'
|
||||||
svnadmin create "$svnrepo"
|
else
|
||||||
|
err='Perl SVN libraries not found or unusable, skipping test'
|
||||||
|
fi
|
||||||
|
test_expect_success "$err" :
|
||||||
|
test_done
|
||||||
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
svnrepo="file://$svnrepo"
|
svnrepo="file://$svnrepo"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user