test suite: Use 'say' to say something instead of 'test_expect_success'

Some tests report that some tests will be skipped.  They used
'test_expect_success' with a trivially successful test.  Nowadays we have
the helper function 'say' for this purpose.

In on case, 'say_color skip' is replaced by 'say' because the former is
not intended as a public API.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

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
 
 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
        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
 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
     test_done
     exit
 fi


@@ -41,7 +41,7 @@ then
        else
                err='Perl SVN libraries not found or unusable, skipping test'
        fi
        else
                err='Perl SVN libraries not found or unusable, skipping test'
        fi

-       test_expect_success "$err" :
+       say "$err"

        test_done
        exit
 fi
        test_done
        exit
 fi

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index e5330395fc866b2a913b4b20ecb66f1f2a3bbaff..ae90d34f6cf50c9ffcbb386fb27b8a15042109ed 100755 (executable)
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -28,7 +28,7 @@ test_expect_success 'tar archive' '
 
 "$UNZIP" -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then
 
 "$UNZIP" -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then

-       echo "Skipping ZIP test, because unzip was not found"
+       say "Skipping ZIP test, because unzip was not found"

        test_done
        exit
 fi
        test_done
        exit
 fi

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 95542e9cfec1d7cc0631521c1c2bef3b7a139af7..74ea8e09f88e0f80dafe88bf9e9d4d404143a591 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -112,7 +112,7 @@ test_expect_success \
     'test_must_fail git rm -f baz'
 chmod 775 .
 else
     'test_must_fail git rm -f baz'
 chmod 775 .
 else

-    test_expect_success 'skipping removal failure (perhaps running as root?)' :
+    say 'skipping removal failure test (perhaps running as root?)'

 fi
 
 test_expect_success \
 fi
 
 test_expect_success \

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index e1ed073f95e63b64c585cbe610de0d96f08256f9..7a84ab61d0de86798d84eaa9e1768688f6b5ad77 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -182,7 +182,7 @@ test_expect_success 'git archive --format=zip with --output' \
 
 $UNZIP -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then
 
 $UNZIP -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then

-       echo "Skipping ZIP tests, because unzip was not found"
+       say "Skipping ZIP tests, because unzip was not found"

        test_done
        exit
 fi
        test_done
        exit
 fi

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 69501e2711f26a7c498d545520dcf47c00d9b1e1..06e6e179f3fc15698d9dbcecd207fa13a9c2b770 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -582,7 +582,7 @@ test_expect_success \
 # subsequent tests require gpg; check if it is available
 gpg --version >/dev/null
 if [ $? -eq 127 ]; then
 # subsequent tests require gpg; check if it is available
 gpg --version >/dev/null
 if [ $? -eq 127 ]; then

-       echo "gpg not found - skipping tag signing and verification tests"
+       say "gpg not found - skipping tag signing and verification tests"

        test_done
        exit
 fi
        test_done
        exit
 fi


@@ -614,7 +614,7 @@ test_expect_success \
 # that version, creation of signed tags using the generated key fails.
 case "$(gpg --version)" in
 'gpg (GnuPG) 1.0.6'*)
 # that version, creation of signed tags using the generated key fails.
 case "$(gpg --version)" in
 'gpg (GnuPG) 1.0.6'*)

-       echo "Skipping signed tag tests, because a bug in 1.0.6 version"
+       say "Skipping signed tag tests, because a bug in 1.0.6 version"

        test_done
        exit
        ;;
        test_done
        exit
        ;;

diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 245a7c36628e955e04852a8c2beb75b8deaf4d7f..d28b71b8cf4bfefb987956be1d36203d69525677 100755 (executable)
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -9,7 +9,7 @@ test_description='Test export of commits to CVS'
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then

-    test_expect_success 'skipping git cvsexportcommit tests, cvs not found' :
+    say 'skipping git cvsexportcommit tests, cvs not found'

     test_done
     exit
 fi
     test_done
     exit
 fi

diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 9ccb1232bbcc0fab80d4f2d4b1dfa15ed09f0757..466240cd415fe544ed55d991e176129e7f869b79 100755 (executable)
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -13,12 +13,12 @@ cvs CLI client via git-cvsserver server'
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then

-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :
+    say 'skipping git-cvsserver tests, cvs not found'

     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {

-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
+    say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'

     test_done
     exit
 }
     test_done
     exit
 }

diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 5d6200c4dfa5b40cdbe4423c6091b75ad47c3039..888223013444999817a93082418fb60690a425e3 100755 (executable)
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -49,12 +49,12 @@ not_present() {
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then

-    test_expect_success 'skipping git-cvsserver tests, cvs not found' :
+    say 'skipping git-cvsserver tests, cvs not found'

     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
     test_done
     exit
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {

-    test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
+    say 'skipping git-cvsserver tests, Perl SQLite interface unavailable'

     test_done
     exit
 }
     test_done
     exit
 }

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 6ed10d0933daa493e7a32296b38e9a32a23a725a..1b78e28c44834be47241084a0e0948c2e6315941 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -74,7 +74,7 @@ safe_chmod () {
 . ./test-lib.sh
 
 perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
 . ./test-lib.sh
 
 perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {

-    test_expect_success 'skipping gitweb tests, perl version is too old' :
+    say 'skipping gitweb tests, perl version is too old'

     test_done
     exit
 }
     test_done
     exit
 }

diff --git a/t/t9700-perl-git.sh b/t/t9700-perl-git.sh
index b81d5dfc340e050815ad9b2fd0d0636c529ce8d3..4a501c68471e3ba472bf82d65789d06838c7eec8 100755 (executable)
--- a/t/t9700-perl-git.sh
+++ b/t/t9700-perl-git.sh
@@ -7,7 +7,7 @@ test_description='perl interface (Git.pm)'
 . ./test-lib.sh
 
 perl -MTest::More -e 0 2>/dev/null || {
 . ./test-lib.sh
 
 perl -MTest::More -e 0 2>/dev/null || {

-       say_color skip "Perl Test::More unavailable, skipping test"
+       say "Perl Test::More unavailable, skipping test"

        test_done
 }
 
        test_done
 }