From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 4A29F431FD0 for ; Sat, 11 Jun 2011 13:49:37 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B2iqFlJsHT4g for ; Sat, 11 Jun 2011 13:49:36 -0700 (PDT) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id 8710D431FB6 for ; Sat, 11 Jun 2011 13:49:36 -0700 (PDT) X-AuditID: 1209190e-b7c39ae000000a8c-78-4df3d4ce96f0 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id 05.1B.02700.EC4D3FD4; Sat, 11 Jun 2011 16:49:19 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BKnZah017437; Sat, 11 Jun 2011 16:49:35 -0400 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p5BKnYJY009486 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sat, 11 Jun 2011 16:49:35 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.76) (envelope-from ) id 1QVV7e-0000Xk-Db; Sat, 11 Jun 2011 16:49:34 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 01/17] test: Fix message when skipping test_expect_equal* tests Date: Sat, 11 Jun 2011 16:49:27 -0400 Message-Id: <1307825367-2035-1-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu> References: <1307822683-848-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrHv+ymdfg0eLGS2u35zJ7MDo8WzV LeYAxigum5TUnMyy1CJ9uwSujPM//jMWHOeomNet28D4kK2LkZNDQsBEounYREYIW0ziwr31 YHEhgX2MEhsWKHcxcgHZGxgllj/axAjh3GeSWNezkA3Cmc8ocf/UOrAWNgENiW37l4ONEhGQ lth5dzZrFyMHB7OAmsSfLhWQsLCAv8ShnW2sIDaLgKrExV93WUBKeAXsJa5O4YA4QkHiypV5 LCA2J1B43sGrLBAH2Uk0nN3MMoGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdY73czBK9 1JTSTYzggJHk28H49aDSIUYBDkYlHl69tZ99hVgTy4orcw8xSnIwKYnySl4ECvEl5adUZiQW Z8QXleakFh9ilOBgVhLhZTkDlONNSaysSi3Kh0lJc7AoifPOlFT3FRJITyxJzU5NLUgtgsnK cHAoSfBmAyNDSLAoNT21Ii0zpwQhzcTBCTKcB2i4FEgNb3FBYm5xZjpE/hSjLsfjDZsOMQqx 5OXnpUqJ8+aCFAmAFGWU5sHNgUX6K0ZxoLeEeRtBqniASQJu0iugJUxASwRKwZaUJCKkpBoY M5558v8/m3838tZ+zfrYKcE7Ga7zzvpyYEFAX33zoajzcs3WGeaxt75vjT5tGffy5VavnoX+ mS8P10W7yG76EHl9O99ezvWmHNq3Wufu515d38S8JeTOhF2rt37dYeqvV6v3s8w213BFnQSP UHX78rv7NeOanhUY7zx/9qTq+TibrtUlV2tvK7EUZyQaajEXFScCAK3uXqfPAgAA Cc: Austin Clements X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2011 20:49:37 -0000 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. --- test/test-lib.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index a59d1c1..d0e2794 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -448,7 +448,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" @@ -471,7 +471,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" @@ -494,7 +494,7 @@ test_expect_equal_failure () output="$1" expected="$2" - if ! test_skip "$@" + if ! test_skip "$test_subtest_name" then if [ "$output" = "$expected" ]; then test_known_broken_ok_ "$test_subtest_name" -- 1.7.5.1