From: Austin Clements <amdragon@mit.edu>
Date: Thu, 12 May 2011 13:09:06 +0000 (-0400)
Subject: test: Fix message when skipping test_expect_equal* tests
X-Git-Tag: 0.9_rc1~32
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5ae1b9c328518a3b09be827ee59498b0598119ff

test: Fix message when skipping test_expect_equal* tests

For these types of tests, the test name is previously recorded in a
variable, not passed to the test function, so pass this variable to
test_skip.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 966b2dcf..b1b0db89 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"