X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=b68290c3f02fb2be28a296da9b7f89e5c00c9595;hb=d0cd253b37646d9364d046e1d3edb022a58c105a;hp=f8c6e1e074037b92141e8315481adb8d93c76200;hpb=b8f12bd3717aa446ef04197734af7a055e6909fe;p=notmuch

diff --git a/test/test-lib.sh b/test/test-lib.sh
index f8c6e1e0..b68290c3 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -916,13 +916,17 @@ test_subtest_known_broken () {
 }
 
 test_expect_success () {
-	test "$#" = 2 ||
-	error "bug in the test script: not 2 parameters to test_expect_success"
-	test_subtest_name="$1"
-	test_reset_state_
-	if ! test_skip "$@"
+	exec 1>&6 2>&7		# Restore stdout and stderr
+	if [ -z "$inside_subtest" ]; then
+		error "bug in the test script: test_expect_success without test_begin_subtest"
+	fi
+	inside_subtest=
+	test "$#" = 1 ||
+	error "bug in the test script: not 1 parameters to test_expect_success"
+
+	if ! test_skip "$test_subtest_name"
 	then
-		test_run_ "$2"
+		test_run_ "$1"
 		run_ret="$?"
 		# test_run_ may update missing external prerequisites
 		test_check_missing_external_prereqs_ "$@" ||
@@ -930,7 +934,7 @@ test_expect_success () {
 		then
 			test_ok_
 		else
-			test_failure_ "$2"
+			test_failure_ "$1"
 		fi
 	fi
 }