aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/test-lib.sh
diff options
context:
space:
mode:
authorGravatar Austin Clements <amdragon@MIT.EDU>2010-11-17 14:27:20 -0500
committerGravatar Carl Worth <cworth@cworth.org>2010-12-07 16:21:23 -0800
commit04d633c2851980797d62573626950cefb046d2f3 (patch)
tree99e9c13c5b76832848966b3e88e754344779fd3b /test/test-lib.sh
parentb9d4af4641b659693ac6c225fe8143a11b69f3af (diff)
Fix handling of broken tests.
Make sure to close the subtest for test_expect_equal_failure, just like in test_expect_equal.
Diffstat (limited to 'test/test-lib.sh')
-rwxr-xr-x[-rw-r--r--]test/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 04a4c144..da91de8d 100644..100755
--- 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"