git-svn: migrate out of contrib (follow-up)
Check for SVN::Core so test 910[45] don't fail if the user doesn't have those installed. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -11,8 +11,15 @@ 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
|
||||||
|
|
||||||
|
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
|
svnadmin >/dev/null 2>&1
|
||||||
if test $? != 1
|
if test $? -ne 1
|
||||||
then
|
then
|
||||||
test_expect_success 'skipping git-svn tests, svnadmin not found' :
|
test_expect_success 'skipping git-svn tests, svnadmin not found' :
|
||||||
test_done
|
test_done
|
||||||
@ -20,7 +27,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
svn >/dev/null 2>&1
|
svn >/dev/null 2>&1
|
||||||
if test $? != 1
|
if test $? -ne 1
|
||||||
then
|
then
|
||||||
test_expect_success 'skipping git-svn tests, svn not found' :
|
test_expect_success 'skipping git-svn tests, svn not found' :
|
||||||
test_done
|
test_done
|
||||||
|
Reference in New Issue
Block a user