diff options
| author | Dmitry Kurochkin <dmitry.kurochkin@gmail.com> | 2011-11-17 17:05:54 +0400 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2011-11-27 08:12:41 -0800 |
| commit | 1660ca5e619a02f430211ac0b26cfdc1ec23a717 (patch) | |
| tree | 4ec17af6382441a87696fec006eab404714fb843 /test/test-lib.sh | |
| parent | 945196d79b56356aef945fad6f34a6a1a3a97ce1 (diff) | |
test: move subtest variables reset into a dedicated function
Currently, there is only one such variable test_subtest_known_broken_.
But more will be added in the future.
Diffstat (limited to 'test/test-lib.sh')
| -rw-r--r-- | test/test-lib.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 93867b0..0735b5c 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -429,7 +429,7 @@ test_begin_subtest () error "bug in test script: Missing test_expect_equal in ${BASH_SOURCE[1]}:${BASH_LINENO[0]}" fi test_subtest_name="$1" - test_subtest_known_broken_= + test_reset_state_ # Remember stdout and stderr file descriptors and redirect test # output to the previously prepared file descriptors 3 and 4 (see # below) @@ -581,14 +581,14 @@ test_failure_message_ () { } test_known_broken_ok_ () { - test_subtest_known_broken_= + test_reset_state_ test_fixed=$(($test_fixed+1)) say_color pass "%-6s" "FIXED" echo " $@" } test_known_broken_failure_ () { - test_subtest_known_broken_= + test_reset_state_ test_broken=$(($test_broken+1)) test_failure_message_ "BROKEN" "$@" return 1 @@ -624,7 +624,7 @@ test_skip () { fi case "$to_skip" in t) - test_subtest_known_broken_= + test_reset_state_ say_color skip >&3 "skipping test: $@" say_color skip "%-6s" "SKIP" echo " $1" @@ -864,6 +864,10 @@ test_emacs () { emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)" } +test_reset_state_ () { + test_subtest_known_broken_= +} + find_notmuch_path () { |