diff options
author | Tomi Ollila <tomi.ollila@iki.fi> | 2013-12-05 14:46:00 +0200 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2013-12-09 23:29:11 +0800 |
commit | 88e6a2995a0108f6ceb94924bd7e6c3623c43dec (patch) | |
tree | 5c20c029c7eb6fa23c49da61e054c3dfe73fd3c5 /test | |
parent | f05e7f3ce50b5762a56406b29012b25e2d1329b2 (diff) |
test: implement and document NOTMUCH_TEST_QUIET variable usage
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).
Diffstat (limited to 'test')
-rw-r--r-- | test/README | 8 | ||||
-rwxr-xr-x | test/basic | 4 | ||||
-rw-r--r-- | test/test-lib.sh | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/test/README b/test/README index d12cff24..79a9b1b2 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 @@ -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 34e0db68..d8e0d911 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 |