From 62a2ebb79cadd5dd96a742d8317d3d978de3eab2 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 5 Dec 2013 14:46:00 +0200 Subject: [PATCH] [PATCH v3 part 3/3] test: implement and document NOTMUCH_TEST_QUIET variable usage --- 32/49446c621ccf9cfb86013173e8b8cd7a9f0626 | 149 ++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 32/49446c621ccf9cfb86013173e8b8cd7a9f0626 diff --git a/32/49446c621ccf9cfb86013173e8b8cd7a9f0626 b/32/49446c621ccf9cfb86013173e8b8cd7a9f0626 new file mode 100644 index 000000000..8e1013497 --- /dev/null +++ b/32/49446c621ccf9cfb86013173e8b8cd7a9f0626 @@ -0,0 +1,149 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id F27F2431FB6 + for ; Thu, 5 Dec 2013 04:46:18 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 8bzz4As-IuXL for ; + Thu, 5 Dec 2013 04:46:14 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 74EB5431FAE + for ; Thu, 5 Dec 2013 04:46:14 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id D24E01001E5; Thu, 5 Dec 2013 14:46:02 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v3 part 3/3] test: implement and document NOTMUCH_TEST_QUIET + variable usage +Date: Thu, 5 Dec 2013 14:46:00 +0200 +Message-Id: <1386247560-31903-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1385399299-12936-1-git-send-email-tomi.ollila@iki.fi> +References: <1385399299-12936-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 05 Dec 2013 12:46:19 -0000 + +When NOTMUCH_TEST_QUIET environment variable is set to non-null value +messages when new test script starts and when test PASSes are disabled. +This eases picking the cases when tests FAIL (as those are still printed). +--- + +Diffdiff of part 3 to previous. + +| diff --git a/test/test-lib.sh b/test/test-lib.sh +| index 9d4a807..d8e0d91 100644 +| --- a/test/test-lib.sh +| +++ b/test/test-lib.sh +| @@ -733,9 +733,7 @@ test_failure_ () { +| return +| fi +| test_failure=$(($test_failure + 1)) +| - if test -n "$NOTMUCH_TEST_QUIET"; then +| - print_test_description +| - fi +| + print_test_description +| test_failure_message_ "FAIL" "$test_subtest_name" "$@" +| test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } +| return 1 + + + test/README | 8 ++++++++ + test/basic | 4 ++-- + test/test-lib.sh | 9 ++++++++- + 3 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/test/README b/test/README +index d12cff2..79a9b1b 100644 +--- a/test/README ++++ b/test/README +@@ -76,6 +76,14 @@ the tests in one of the following ways. + TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient ./emacs + make test TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient + ++Quiet Execution ++--------------- ++ ++Normally, when new script starts and when test PASSes you get a message ++printed on screen. This printing can be disabled by setting the ++NOTMUCH_TEST_QUIET variable to a non-null value. Message on test ++failures and skips are still printed. ++ + Skipping Tests + -------------- + If, for any reason, you need to skip one or more tests, you can do so +diff --git a/test/basic b/test/basic +index 64eb7d7..f7eed32 100755 +--- a/test/basic ++++ b/test/basic +@@ -74,12 +74,12 @@ suppress_diff_date() { + } + + test_begin_subtest "Ensure that test output is suppressed unless the test fails" +-output=$(cd $TEST_DIRECTORY; ./test-verbose 2>&1 | suppress_diff_date) ++output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose 2>&1 | suppress_diff_date) + expected=$(cat $EXPECTED/test-verbose-no | suppress_diff_date) + test_expect_equal "$output" "$expected" + + test_begin_subtest "Ensure that -v does not suppress test output" +-output=$(cd $TEST_DIRECTORY; ./test-verbose -v 2>&1 | suppress_diff_date) ++output=$(cd $TEST_DIRECTORY; NOTMUCH_TEST_QUIET= ./test-verbose -v 2>&1 | suppress_diff_date) + expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) + # Do not include the results of test-verbose in totals + rm $TEST_DIRECTORY/test-results/test-verbose +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 34e0db6..d8e0d91 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -198,7 +198,10 @@ print_test_description () + echo $this_test: "Testing ${test_description}" + test_description_printed=1 + } +-print_test_description ++if [ -z "$NOTMUCH_TEST_QUIET" ] ++then ++ print_test_description ++fi + + exec 5>&1 + +@@ -717,6 +720,9 @@ test_ok_ () { + return + fi + test_success=$(($test_success + 1)) ++ if test -n "$NOTMUCH_TEST_QUIET"; then ++ return 0 ++ fi + say_color pass "%-6s" "PASS" + echo " $test_subtest_name" + } +@@ -727,6 +733,7 @@ test_failure_ () { + return + fi + test_failure=$(($test_failure + 1)) ++ print_test_description + test_failure_message_ "FAIL" "$test_subtest_name" "$@" + test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } + return 1 +-- +1.8.0 + -- 2.26.2