X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ftest-lib.sh;h=f8df6a5f1b8f921cabfd39d26a1763d388f30564;hp=966b2dcfd64ab9975171c39c1959fb10ae5941a2;hb=003e718020b335f329f852ff1a3da23873d2ff6e;hpb=22af786838793ed97fa3dbb1d223e90602912b71

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 966b2dcf..f8df6a5f 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -449,7 +449,7 @@ test_expect_equal ()
 
 	output="$1"
 	expected="$2"
-	if ! test_skip "$@"
+	if ! test_skip "$test_subtest_name"
 	then
 		if [ "$output" = "$expected" ]; then
 			test_ok_ "$test_subtest_name"
@@ -472,7 +472,7 @@ test_expect_equal_file ()
 
 	output="$1"
 	expected="$2"
-	if ! test_skip "$@"
+	if ! test_skip "$test_subtest_name"
 	then
 		if diff -q "$expected" "$output" >/dev/null ; then
 			test_ok_ "$test_subtest_name"
@@ -563,6 +563,7 @@ test_failure_ () {
 	test_failure=$(($test_failure + 1))
 	test_failure_message_ "FAIL" "$@"
 	test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }
+	return 1
 }
 
 test_failure_message_ () {
@@ -584,6 +585,7 @@ test_known_broken_failure_ () {
 	test_subtest_known_broken_=
 	test_broken=$(($test_broken+1))
 	test_failure_message_ "BROKEN" "$@"
+	return 1
 }
 
 test_debug () {