From: Austin Clements <amdragon@MIT.EDU>
Date: Wed, 17 Nov 2010 19:27:20 +0000 (-0500)
Subject: Fix handling of broken tests.
X-Git-Tag: debian/0.6_254~230
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04d633c2851980797d62573626950cefb046d2f3;p=notmuch.git

Fix handling of broken tests.

Make sure to close the subtest for test_expect_equal_failure, just
like in test_expect_equal.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
old mode 100644
new mode 100755
index 04a4c144..da91de8d
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -440,6 +440,8 @@ test_expect_equal ()
 
 test_expect_equal_failure ()
 {
+	exec 1>&6 2>&7		# Restore stdout and stderr
+	inside_subtest=
 	test "$#" = 3 && { prereq=$1; shift; } || prereq=
 	test "$#" = 2 ||
 	error "bug in the test script: not 2 or 3 parameters to test_expect_equal"