test: suppress diff for broken test without V=1

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 79dc8419950c5db76d8310bc0f0d5b22ce7c341a..98203b9bc1655bd016e0f1a52ad490ed4f9deffb 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -866,7 +866,9 @@ test_failure_message_ () {
        say_color error "%-6s" "$1"
        echo " $2"
        shift 2
        say_color error "%-6s" "$1"
        echo " $2"
        shift 2

-       echo "$@" | sed -e 's/^/        /'
+       if [ "$#" != "0" ]; then
+               echo "$@" | sed -e 's/^/        /'
+       fi

        if test "$verbose" != "t"; then cat test.output; fi
 }
 
        if test "$verbose" != "t"; then cat test.output; fi
 }
 


@@ -880,7 +882,11 @@ test_known_broken_ok_ () {
 test_known_broken_failure_ () {
        test_reset_state_
        test_broken=$(($test_broken+1))
 test_known_broken_failure_ () {
        test_reset_state_
        test_broken=$(($test_broken+1))

-       test_failure_message_ "BROKEN" "$test_subtest_name" "$@"
+       if [ -z "$NOTMUCH_TEST_QUIET" ]; then
+               test_failure_message_ "BROKEN" "$test_subtest_name" "$@"
+       else
+               test_failure_message_ "BROKEN" "$test_subtest_name"
+       fi

        return 1
 }
 
        return 1
 }