diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-07 03:17:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-07 03:17:59 -0700 |
| commit | 4b832e819de51bd2f32eb798cb648dc8d4064dbc (patch) | |
| tree | 09676777a782e0a22367d414342ba7723ae3c9bc | |
| parent | 60d02ccc18408e54ace8692532fcc73d4035b3c2 (diff) | |
| download | git-4b832e819de51bd2f32eb798cb648dc8d4064dbc.tar.gz git-4b832e819de51bd2f32eb798cb648dc8d4064dbc.tar.xz | |
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>
| -rw-r--r-- | t/lib-git-svn.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 450fee899..29a1e72c6 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -11,8 +11,15 @@ 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 $? != 1 +if test $? -ne 1 then test_expect_success 'skipping git-svn tests, svnadmin not found' : test_done @@ -20,7 +27,7 @@ then fi svn >/dev/null 2>&1 -if test $? != 1 +if test $? -ne 1 then test_expect_success 'skipping git-svn tests, svn not found' : test_done |