From: David Bremner <bremner@debian.org>
Date: Tue, 13 Sep 2011 01:40:57 +0000 (-0300)
Subject: test: reset test_subtest_known_broken_ after each success/failure.
X-Git-Tag: 0.9_rc1~33
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=22af786838793ed97fa3dbb1d223e90602912b71;hp=fa52a0d094a6585f36f484082fc3e28261718e72

test: reset test_subtest_known_broken_ after each success/failure.

This means that test_subtest_known_broken needs to be called before
every known broken subtest, which is no different than what is
documented for the test_begin_subtest case.

The assumption is that every test ends up calling either skipping,
calling test_ok_ or test_failure_ and and the latter in turn delegate
to the known_broken versions in the case where
test_subtest_known_broken_ is set.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 196ef496..966b2dcf 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -574,12 +574,14 @@ test_failure_message_ () {
 }
 
 test_known_broken_ok_ () {
+	test_subtest_known_broken_=
 	test_fixed=$(($test_fixed+1))
 	say_color pass "%-6s" "FIXED"
 	echo " $@"
 }
 
 test_known_broken_failure_ () {
+	test_subtest_known_broken_=
 	test_broken=$(($test_broken+1))
 	test_failure_message_ "BROKEN" "$@"
 }
@@ -614,6 +616,7 @@ test_skip () {
 	fi
 	case "$to_skip" in
 	t)
+		test_subtest_known_broken_=
 		say_color skip >&3 "skipping test: $@"
 		say_color skip "%-6s" "SKIP"
 		echo " $1"