Merge branch 'maint'

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 67c431d4ebbb32fe8d88a83104485b38d746fa62..de384e6ac3a125e59156abbf897a3371f736bbfa 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -5,7 +5,7 @@ git_svn_id=git""-svn-id
 
 if test -n "$NO_SVN_TESTS"
 then
-       test_expect_success 'skipping git svn tests, NO_SVN_TESTS defined' :
+       say 'skipping git svn tests, NO_SVN_TESTS defined'
        test_done
        exit
 fi
@@ -17,7 +17,7 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree
 svn >/dev/null 2>&1
 if test $? -ne 1
 then
-    test_expect_success 'skipping git svn tests, svn not found' :
+    say 'skipping git svn tests, svn not found'
     test_done
     exit
 fi
@@ -41,7 +41,7 @@ then
        else
                err='Perl SVN libraries not found or unusable, skipping test'
        fi
-       test_expect_success "$err" :
+       say "$err"
        test_done
        exit
 fi