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>
Junio C Hamano committed
Jul 7, 2006 at 03:17 UTC
4b832e819de51bd2f32eb798cb648dc8d4064dbc
1 file changed
+9
-2
t/lib-git-svn.sh
+9
-2
@@ -11,8 +11,15 @@ GIT_DIR=$PWD/.git
11
GIT_SVN_DIR=$GIT_DIR/svn/git-svn
12
SVN_TREE=$GIT_SVN_DIR/svn-tree
13
14
+perl -e 'use SVN::Core' >/dev/null 2>&1
15
+if test $? -ne 0
16
+then
17
+ echo 'Perl SVN libraries not found, tests requiring those will be skipped'
18
+ GIT_SVN_NO_LIB=1
19
+fi
20
+
21
svnadmin >/dev/null 2>&1
15
-if test $? != 1
22
+if test $? -ne 1
23
then
24
test_expect_success 'skipping git-svn tests, svnadmin not found' :
25
test_done
@@ -20,7 +27,7 @@ then
27
fi
28
29
svn >/dev/null 2>&1
23
-if test $? != 1
30
+if test $? -ne 1
31
then
32
test_expect_success 'skipping git-svn tests, svn not found' :
33
test_done