All tests in t9119 were disabled for subversion versions other than 1.[45].*. Adjust the single test where svn 1.6.* output is slightly different to ignore the differing line, and make the test script run with subversion 1.[456].*. Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> --- t/t9119-git-svn-info.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh index 95741cb..eff4ae2 100755 --- a/t/t9119-git-svn-info.sh +++ b/t/t9119-git-svn-info.sh @@ -7,9 +7,10 @@ test_description='git svn info' . ./lib-git-svn.sh # Tested with: svn, version 1.4.4 (r25188) +# Tested with: svn, version 1.6.[12345689] v=`svn_cmd --version | sed -n -e 's/^svn, version \(1\.[0-9]*\.[0-9]*\).*$/\1/p'` case $v in -1.[45].*) +1.[456].*) ;; *) say "skipping svn-info test (SVN version: $v not supported)" @@ -166,7 +167,7 @@ test_expect_success 'info added-directory' " git add added-directory && cd .. && (cd svnwc; svn info added-directory) \ - > expected.info-added-directory && + | grep -v \"Repository UUID\" > expected.info-added-directory && (cd gitwc; git svn info added-directory) \ > actual.info-added-directory && test_cmp expected.info-added-directory actual.info-added-directory -- 1.7.0.1.241.g6604f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html