[RFC/PATCH] t9157-*.sh: Add an svn version check
- From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
- Date
- Jan 6, 2011, 18:29 UTC
- Message-ID
- <4D260A03.90903@ramsay1.demon.co.uk>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> ---
This test fails for me, because my svn version(s) are too old (1.4.3 and 1.4.6), and so I've got into the habit of running the tests with NO_SVN_TESTS=1. (which is a bit of a shame in terms of test coverage, but it is *much* quicker!)
I don't know the details, but it seems that the 'svn merge' of this vintage does not support the operations required by this test. Unfortunately, I don't know what the minimum required version of svn is, so I'm hoping that someone can take this patch and fix it up properly ...
ATB, Ramsay Jones
t/t9157-git-svn-fetch-merge.sh | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh index da582c5..accf61e 100755 --- a/t/t9157-git-svn-fetch-merge.sh +++ b/t/t9157-git-svn-fetch-merge.sh @@ -6,6 +6,14 @@ test_description='git svn merge detection' . ./lib-git-svn.sh +svn_ver="$(svn --version --quiet)" +case $svn_ver in +[0-1].[0-4].[0-6]) + skip_all="skipping git-svn test - SVN too old ($svn_ver)" + test_done + ;; +esac + test_expect_success 'initialize source svn repo' ' svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd mkdir -m x "$svnrepo"/branches &&
-- 1.7.3