test-lib: disable trace when test is not verbose

The "-x" test-script option turns on the shell's "-x"
tracing, which can help show why a particular test is
failing. Unfortunately, this can create false negatives in
some tests if they invoke a shell function with its stderr
redirected. t5512.10 is such a test, as it does:

test_must_fail git ls-remote refs*master >actual 2>&1 &&
test_cmp exp actual

The "actual" file gets the "-x" trace for the test_must_fail
function, which prevents it from matching the expected
output.

There's no way to avoid this without managing the
trace flag inside each sub-function, which isn't really a
workable solution. But unless you specifically care about
t5512.10, we can work around it by enabling tracing only for
the specific tests we want.

You can already do:

./t5512-ls-remote.sh -x --verbose-only=16

to see the trace only for a specific test. But that doesn't
_disable_ the tracing in the other tests; it just sends it
to /dev/null. However, there's no point in generating a
trace that the user won't see, so we can simply disable
tracing whenever it doesn't have a matching verbose flag.

The normal case of just "./t5512-ls-remote.sh -x" stays the
same, as "-x" already implies "--verbose" (and
"--verbose-only" overrides "--verbose", which is why this
works at all). And for our test, we need only check
$verbose, as maybe_setup_verbose will have already
set that flag based on the $verbose_only list).

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

diff --git a/t/test-lib.sh b/t/test-lib.sh
index bc20185b51ba85db9f12659096b5ca859206ca35..ab8461648494848b05170ac402f66acd168baee1 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -492,6 +492,10 @@ maybe_setup_valgrind () {
        fi
 }
 
        fi
 }
 

+want_trace () {
+       test "$trace" = t && test "$verbose" = t
+}
+

 # This is a separate function because some tests use
 # "return" to end a test_expect_success block early
 # (and we want to make sure we run any cleanup like
 # This is a separate function because some tests use
 # "return" to end a test_expect_success block early
 # (and we want to make sure we run any cleanup like


@@ -499,7 +503,7 @@ maybe_setup_valgrind () {
 test_eval_inner_ () {
        # Do not add anything extra (including LF) after '$*'
        eval "
 test_eval_inner_ () {
        # Do not add anything extra (including LF) after '$*'
        eval "

-               test \"$trace\" = t && set -x
+               want_trace && set -x

                $*"
 }
 
                $*"
 }
 


@@ -515,7 +519,7 @@ test_eval_ () {
        {
                test_eval_inner_ "$@" </dev/null >&3 2>&4
                test_eval_ret_=$?
        {
                test_eval_inner_ "$@" </dev/null >&3 2>&4
                test_eval_ret_=$?

-               if test "$trace" = t
+               if want_trace

                then
                        set +x
                        if test "$test_eval_ret_" != 0
                then
                        set +x
                        if test "$test_eval_ret_" != 0