[PATCH 1/4] Fix handling of broken tests.

Austin Clements amdragon at MIT.EDU
Wed Nov 17 11:27:20 PST 2010


Make sure to close the subtest for test_expect_equal_failure, just
like in test_expect_equal.
---
 test/test-lib.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 test/test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
old mode 100644
new mode 100755
index 04a4c14..da91de8
--- 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"
-- 
1.7.2.3



More information about the notmuch mailing list