t: drop "verbose" helper function

We have a small helper function called "verbose", with the idea that you
can write:

  verbose foo

to get a message to stderr when the "foo" command fails, even if it does
not produce any output itself. This goes back to 8ad1652418 (t5304: use
helper to report failure of "test foo = bar", 2014-10-10). It does work,
but overall it has not been a big success for two reasons:

  1. Test writers have to remember to put it there (and the resulting
     test code is longer as a result).

  2. It doesn't handle the opposite case (we expect "foo" to fail, but
     it succeeds), leading to inconsistencies in tests (which you can
     see in many hunks of this patch, e.g. ones involving "has_cr").

Most importantly, we added a136f6d8ff (test-lib.sh: support -x option
for shell-tracing, 2014-10-10) at the same time, and it does roughly the
same thing. The output is not quite as succinct as "verbose", and you
have to watch out for stray shell-traces ending up in stderr. But it
solves both of the problems above, and has clearly become the preferred
tool.

Let's consider the "verbose" function a failed experiment and remove the
last few callers (which are all many years old, and have been dwindling
as we remove them from scripts we touch for other reasons). It will be
one less thing for new test writers to see and wonder if they should be
using themselves.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 35cc8c3b39896cb5caf6740d6847f5dec66e1dea..81946e87ccb9b478789164a6db54d9a80278288d 100755 (executable)
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -125,7 +125,7 @@ test_expect_success 'update with autocrlf=input' '
        munge_cr append dir/two &&
        git update-index -- one dir/two &&
        differs=$(git diff-index --cached HEAD) &&
-       verbose test -z "$differs"
+       test -z "$differs"
 
 '
 
@@ -138,7 +138,7 @@ test_expect_success 'update with autocrlf=true' '
        munge_cr append dir/two &&
        git update-index -- one dir/two &&
        differs=$(git diff-index --cached HEAD) &&
-       verbose test -z "$differs"
+       test -z "$differs"
 
 '
 
@@ -153,7 +153,7 @@ test_expect_success 'checkout with autocrlf=true' '
        test "$one" = $(git hash-object --stdin <one) &&
        test "$two" = $(git hash-object --stdin <dir/two) &&
        differs=$(git diff-index --cached HEAD) &&
-       verbose test -z "$differs"
+       test -z "$differs"
 '
 
 test_expect_success 'checkout with autocrlf=input' '
@@ -167,7 +167,7 @@ test_expect_success 'checkout with autocrlf=input' '
        test "$one" = $(git hash-object --stdin <one) &&
        test "$two" = $(git hash-object --stdin <dir/two) &&
        differs=$(git diff-index --cached HEAD) &&
-       verbose test -z "$differs"
+       test -z "$differs"
 '
 
 test_expect_success 'apply patch (autocrlf=input)' '
@@ -177,7 +177,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
        git read-tree --reset -u HEAD &&
 
        git apply patch.file &&
-       verbose test "$patched" = "$(git hash-object --stdin <one)"
+       test "$patched" = "$(git hash-object --stdin <one)"
 '
 
 test_expect_success 'apply patch --cached (autocrlf=input)' '
@@ -187,7 +187,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' '
        git read-tree --reset -u HEAD &&
 
        git apply --cached patch.file &&
-       verbose test "$patched" = $(git rev-parse :one)
+       test "$patched" = $(git rev-parse :one)
 '
 
 test_expect_success 'apply patch --index (autocrlf=input)' '
@@ -197,8 +197,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' '
        git read-tree --reset -u HEAD &&
 
        git apply --index patch.file &&
-       verbose test "$patched" = $(git rev-parse :one) &&
-       verbose test "$patched" = $(git hash-object --stdin <one)
+       test "$patched" = $(git rev-parse :one) &&
+       test "$patched" = $(git hash-object --stdin <one)
 '
 
 test_expect_success 'apply patch (autocrlf=true)' '
@@ -208,7 +208,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
        git read-tree --reset -u HEAD &&
 
        git apply patch.file &&
-       verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
+       test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
 '
 
 test_expect_success 'apply patch --cached (autocrlf=true)' '
@@ -218,7 +218,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' '
        git read-tree --reset -u HEAD &&
 
        git apply --cached patch.file &&
-       verbose test "$patched" = $(git rev-parse :one)
+       test "$patched" = $(git rev-parse :one)
 '
 
 test_expect_success 'apply patch --index (autocrlf=true)' '
@@ -228,8 +228,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' '
        git read-tree --reset -u HEAD &&
 
        git apply --index patch.file &&
-       verbose test "$patched" = $(git rev-parse :one) &&
-       verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
+       test "$patched" = $(git rev-parse :one) &&
+       test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
 '
 
 test_expect_success '.gitattributes says two is binary' '
@@ -240,7 +240,7 @@ test_expect_success '.gitattributes says two is binary' '
        git read-tree --reset -u HEAD &&
 
        ! has_cr dir/two &&
-       verbose has_cr one &&
+       has_cr one &&
        ! has_cr three
 '
 
@@ -259,8 +259,8 @@ test_expect_success '.gitattributes says two and three are text' '
        echo "t* crlf" >.gitattributes &&
        git read-tree --reset -u HEAD &&
 
-       verbose has_cr dir/two &&
-       verbose has_cr three
+       has_cr dir/two &&
+       has_cr three
 '
 
 test_expect_success 'in-tree .gitattributes (1)' '
@@ -273,7 +273,7 @@ test_expect_success 'in-tree .gitattributes (1)' '
        git read-tree --reset -u HEAD &&
 
        ! has_cr one &&
-       verbose has_cr three
+       has_cr three
 '
 
 test_expect_success 'in-tree .gitattributes (2)' '
@@ -283,7 +283,7 @@ test_expect_success 'in-tree .gitattributes (2)' '
        git checkout-index -f -q -u -a &&
 
        ! has_cr one &&
-       verbose has_cr three
+       has_cr three
 '
 
 test_expect_success 'in-tree .gitattributes (3)' '
@@ -294,7 +294,7 @@ test_expect_success 'in-tree .gitattributes (3)' '
        git checkout-index -u one dir/two three &&
 
        ! has_cr one &&
-       verbose has_cr three
+       has_cr three
 '
 
 test_expect_success 'in-tree .gitattributes (4)' '
@@ -305,7 +305,7 @@ test_expect_success 'in-tree .gitattributes (4)' '
        git checkout-index -u .gitattributes &&
 
        ! has_cr one &&
-       verbose has_cr three
+       has_cr three
 '
 
 test_expect_success 'checkout with existing .gitattributes' '

diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 1b6437ec0794e887e1d14452c516c487d0bb007f..ae5cd3f5a0e1b9fc8a109b60260b22b0351665f7 100755 (executable)
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -89,7 +89,7 @@ do
                rm -f .git/info/refs &&
                git update-server-info &&
                actual="$(test_modebits .git/info/refs)" &&
-               verbose test "x$actual" = "x-$y"
+               test "x$actual" = "x-$y"
 
        '
 
@@ -99,7 +99,7 @@ do
                rm -f .git/info/refs &&
                git update-server-info &&
                actual="$(test_modebits .git/info/refs)" &&
-               verbose test "x$actual" = "x-$x"
+               test "x$actual" = "x-$x"
 
        '
 

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 48b76f82325da49d521bf4603566ebcbc3653ddc..1b3e97c8755f3d8b41549e70cf67529298118182 100755 (executable)
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -74,9 +74,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
        test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
        : first pick results in no changes &&
        git rebase --skip &&
-       verbose test "$(commit_message HEAD~2)" = "topic_4" &&
-       verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-       verbose test "$(commit_message HEAD)" = "Empty commit"
+       test "$(commit_message HEAD~2)" = "topic_4" &&
+       test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+       test "$(commit_message HEAD)" = "Empty commit"
 '
 
 test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
@@ -85,9 +85,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'
        test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
        : first pick results in no changes &&
        git rebase --skip &&
-       verbose test "$(commit_message HEAD~2)" = "topic_4" &&
-       verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-       verbose test "$(commit_message HEAD)" = "Empty commit"
+       test "$(commit_message HEAD~2)" = "topic_4" &&
+       test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+       test "$(commit_message HEAD)" = "Empty commit"
 '
 
 test_done

diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 1c89050a974c7b101056865a4b48e7f18a90d29e..6fed993ea0b34dddae94356354c889ada9f16497 100755 (executable)
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -24,7 +24,7 @@ test_expect_success setup '
 test_expect_success 'detect rewrite' '
 
        actual=$(git diff-files -B --summary test) &&
-       verbose expr "$actual" : " rewrite test ([0-9]*%)$"
+       expr "$actual" : " rewrite test ([0-9]*%)$"
 
 '
 

diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
index 9aaa068ed9bc9a7853ce8331ec5d66107a50b94b..a90b46b678ca35a6af71769149bcfa7cc2317a39 100755 (executable)
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@ -24,7 +24,7 @@ test_expect_success '-G matches' '
 
 test_expect_success '-S --pickaxe-regex' '
        git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
-       verbose test 4096-zeroes.txt = "$(cat out)"
+       test 4096-zeroes.txt = "$(cat out)"
 '
 
 test_done

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 662ae9b152047ace348836c9610b9c476f4171d2..f3673274418cd7bf6cb395601241c4f2152f8af6 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -16,7 +16,7 @@ add_blob() {
        before=$(git count-objects | sed "s/ .*//") &&
        BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
        BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
-       verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+       test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
        test_path_is_file $BLOB_FILE &&
        test-tool chmtime =+0 $BLOB_FILE
 }
@@ -51,11 +51,11 @@ test_expect_success 'prune stale packs' '
 test_expect_success 'prune --expire' '
        add_blob &&
        git prune --expire=1.hour.ago &&
-       verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+       test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
        test_path_is_file $BLOB_FILE &&
        test-tool chmtime =-86500 $BLOB_FILE &&
        git prune --expire 1.day &&
-       verbose test $before = $(git count-objects | sed "s/ .*//") &&
+       test $before = $(git count-objects | sed "s/ .*//") &&
        test_path_is_missing $BLOB_FILE
 '
 
@@ -63,11 +63,11 @@ test_expect_success 'gc: implicit prune --expire' '
        add_blob &&
        test-tool chmtime =-$((2*$week-30)) $BLOB_FILE &&
        git gc --no-cruft &&
-       verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+       test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
        test_path_is_file $BLOB_FILE &&
        test-tool chmtime =-$((2*$week+1)) $BLOB_FILE &&
        git gc --no-cruft &&
-       verbose test $before = $(git count-objects | sed "s/ .*//") &&
+       test $before = $(git count-objects | sed "s/ .*//") &&
        test_path_is_missing $BLOB_FILE
 '
 
@@ -138,7 +138,7 @@ test_expect_success 'gc --no-prune' '
        test-tool chmtime =-$((5001*$day)) $BLOB_FILE &&
        git config gc.pruneExpire 2.days.ago &&
        git gc --no-prune --no-cruft &&
-       verbose test 1 = $(git count-objects | sed "s/ .*//") &&
+       test 1 = $(git count-objects | sed "s/ .*//") &&
        test_path_is_file $BLOB_FILE
 '
 
@@ -192,10 +192,10 @@ test_expect_success 'gc: prune old objects after local clone' '
        git clone --no-hardlinks . aclone &&
        (
                cd aclone &&
-               verbose test 1 = $(git count-objects | sed "s/ .*//") &&
+               test 1 = $(git count-objects | sed "s/ .*//") &&
                test_path_is_file $BLOB_FILE &&
                git gc --prune --no-cruft &&
-               verbose test 0 = $(git count-objects | sed "s/ .*//") &&
+               test 0 = $(git count-objects | sed "s/ .*//") &&
                test_path_is_missing $BLOB_FILE
        )
 '

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 41d0ca00b1c025beaadedf195586fb81db835bbb..573eb97a0f7f06e45d3358e65be8b55816ea47b3 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -493,7 +493,7 @@ test_expect_success 'empty email' '
        test_tick &&
        C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
        A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-       verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
+       test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
 '
 
 test_expect_success 'del LF before empty (1)' '

diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index dbfa8a4d4c22b717450fb8d073c6835616d6d556..4521508b83a6560e6d025dca1750838f083fdc89 100755 (executable)
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -152,7 +152,7 @@ test_expect_success 'do not complain about existing broken links (commit)' '
        EOF
        commit=$(git hash-object -t commit -w broken-commit) &&
        git gc --no-cruft -q 2>stderr &&
-       verbose git cat-file -e $commit &&
+       git cat-file -e $commit &&
        test_must_be_empty stderr
 '
 

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 2e6a3c0a5445c67fe77eaa2b8b0e04fb81b0510c..898a92053282d762b10fc2b53b76f84fbd2892e6 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -192,7 +192,7 @@ test_expect_success "Michael Cassar's test case" '
 
        T=$(git write-tree) &&
        git ls-tree -r $T >out &&
-       verbose grep partA/outline.txt out
+       grep partA/outline.txt out
 '
 
 rm -fr papers partA path?

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index c975eb54d234d77b2f13df2a96acd4cbefb93865..0ef7b78457368fd8f0e403907e7d582e97e62248 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -120,7 +120,7 @@ test_expect_success 'git clean with relative prefix' '
                grep part3 |
                sed -n -e "s|^Would remove ||p"
        ) &&
-       verbose test "$would_clean" = ../src/part3.c
+       test "$would_clean" = ../src/part3.c
 '
 
 test_expect_success 'git clean with absolute path' '
@@ -133,7 +133,7 @@ test_expect_success 'git clean with absolute path' '
                grep part3 |
                sed -n -e "s|^Would remove ||p"
        ) &&
-       verbose test "$would_clean" = ../src/part3.c
+       test "$would_clean" = ../src/part3.c
 '
 
 test_expect_success 'git clean with out of work tree relative path' '

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index d6c0478d98b85412307a422b142386c180ad030a..8835e16e8110f458885c977d4002685a2fc16662 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -405,40 +405,40 @@ test_expect_success '__gitdir - remote as argument' '
 
 test_expect_success '__git_dequote - plain unquoted word' '
        __git_dequote unquoted-word &&
-       verbose test unquoted-word = "$dequoted_word"
+       test unquoted-word = "$dequoted_word"
 '
 
 # input:    b\a\c\k\'\\\"s\l\a\s\h\es
 # expected: back'\"slashes
 test_expect_success '__git_dequote - backslash escaped' '
        __git_dequote "b\a\c\k\\'\''\\\\\\\"s\l\a\s\h\es" &&
-       verbose test "back'\''\\\"slashes" = "$dequoted_word"
+       test "back'\''\\\"slashes" = "$dequoted_word"
 '
 
 # input:    sin'gle\' '"quo'ted
 # expected: single\ "quoted
 test_expect_success '__git_dequote - single quoted' '
        __git_dequote "'"sin'gle\\\\' '\\\"quo'ted"'" &&
-       verbose test '\''single\ "quoted'\'' = "$dequoted_word"
+       test '\''single\ "quoted'\'' = "$dequoted_word"
 '
 
 # input:    dou"ble\\" "\"\quot"ed
 # expected: double\ "\quoted
 test_expect_success '__git_dequote - double quoted' '
        __git_dequote '\''dou"ble\\" "\"\quot"ed'\'' &&
-       verbose test '\''double\ "\quoted'\'' = "$dequoted_word"
+       test '\''double\ "\quoted'\'' = "$dequoted_word"
 '
 
 # input: 'open single quote
 test_expect_success '__git_dequote - open single quote' '
        __git_dequote "'\''open single quote" &&
-       verbose test "open single quote" = "$dequoted_word"
+       test "open single quote" = "$dequoted_word"
 '
 
 # input: "open double quote
 test_expect_success '__git_dequote - open double quote' '
        __git_dequote "\"open double quote" &&
-       verbose test "open double quote" = "$dequoted_word"
+       test "open double quote" = "$dequoted_word"
 '
 
 
@@ -616,7 +616,7 @@ test_expect_success '__git_is_configured_remote' '
        test_when_finished "git remote remove remote_2" &&
        git remote add remote_2 git://remote_2 &&
        (
-               verbose __git_is_configured_remote remote_2 &&
+               __git_is_configured_remote remote_2 &&
                test_must_fail __git_is_configured_remote non-existent
        )
 '
@@ -2596,30 +2596,30 @@ test_expect_success 'options with value' '
 test_expect_success 'sourcing the completion script clears cached commands' '
        (
                __git_compute_all_commands &&
-               verbose test -n "$__git_all_commands" &&
+               test -n "$__git_all_commands" &&
                . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-               verbose test -z "$__git_all_commands"
+               test -z "$__git_all_commands"
        )
 '
 
 test_expect_success 'sourcing the completion script clears cached merge strategies' '
        (
                __git_compute_merge_strategies &&
-               verbose test -n "$__git_merge_strategies" &&
+               test -n "$__git_merge_strategies" &&
                . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-               verbose test -z "$__git_merge_strategies"
+               test -z "$__git_merge_strategies"
        )
 '
 
 test_expect_success 'sourcing the completion script clears cached --options' '
        (
                __gitcomp_builtin checkout &&
-               verbose test -n "$__gitcomp_builtin_checkout" &&
+               test -n "$__gitcomp_builtin_checkout" &&
                __gitcomp_builtin notes_edit &&
-               verbose test -n "$__gitcomp_builtin_notes_edit" &&
+               test -n "$__gitcomp_builtin_notes_edit" &&
                . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-               verbose test -z "$__gitcomp_builtin_checkout" &&
-               verbose test -z "$__gitcomp_builtin_notes_edit"
+               test -z "$__gitcomp_builtin_checkout" &&
+               test -z "$__gitcomp_builtin_notes_edit"
        )
 '
 

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 999d46fafe783134aa921c6316f3f6b0a58c5d7f..6e19ebc922a4166565664995d849bbd248c93ff6 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1227,15 +1227,6 @@ test_i18ngrep () {
        return 1
 }
 
-# Call any command "$@" but be more verbose about its
-# failure. This is handy for commands like "test" which do
-# not output anything when they fail.
-verbose () {
-       "$@" && return 0
-       echo >&4 "command failed: $(git rev-parse --sq-quote "$@")"
-       return 1
-}
-
 # Check if the file expected to be empty is indeed empty, and barfs
 # otherwise.