Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1688A431FD0 for ; Thu, 12 May 2011 06:14:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 k9Hin3m0WlwQ for ; Thu, 12 May 2011 06:14:49 -0700 (PDT) Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU [18.9.25.15]) by olra.theworths.org (Postfix) with ESMTP id 9467A431FB6 for ; Thu, 12 May 2011 06:14:49 -0700 (PDT) X-AuditID: 1209190f-b7c4dae0000007bd-f1-4dcbdd4b98f3 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP id B9.76.01981.B4DDBCD4; Thu, 12 May 2011 09:14:51 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id p4CDElV5016067; Thu, 12 May 2011 09:14:47 -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 p4CDEk3u005215 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Thu, 12 May 2011 09:14:47 -0400 (EDT) Received: from amthrax by drake.mit.edu with local (Exim 4.76) (envelope-from ) id 1QKVj4-0004YL-E0; Thu, 12 May 2011 09:14:46 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH] test: Fix message when skipping test_expect_equal* tests Date: Thu, 12 May 2011 09:14:40 -0400 Message-Id: <1305206080-17461-1-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.5.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6nrut997SvwdRGbYvrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEr4/XJu+wFxzkqPj46ztzA+JCti5GTQ0LAROL9o9ksELaYxIV7 68HiQgL7GCXO3nLtYuQCsjcwSnRf/scIkbjPJDFhlgKEPZ9R4tMrHRCbTUBDYtv+5WA1IgLS EjvvzmbtYuTgYBYQkXg3kwkkLCzgKXHt/2R2EJtFQFXixIf7YHFeAQeJr093MULcoCBx5co8 lgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmujlZpbopaaUbmIEBQCnJP8Oxm8HlQ4x CnAwKvHwXl17yleINbGsuDL3EKMkB5OSKK/vrdO+QnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4 pZYAlfOmJFZWpRblw6SkOViUxHlnSar7CgmkJ5akZqemFqQWwWRlODiUJHjd7wANFSxKTU+t SMvMKUFIM3FwggznARquC1LDW1yQmFucmQ6RP8Woy/H50aEDjEIsefl5qVLivFEgRQIgRRml eXBzYJH7ilEc6C1hXn2QKh5g1MNNegW0hAloifmGEyBLShIRUlINjCa8L69K/xUqm7Tx4a4v /3PyN8+5ctz2d9mqDZtjXt/eGy2fqxTceUMvKfO+D6srR8kXsU6zAA/zyvI3PM3/1bdVrz24 q/XNOmNbFtYGzksXrry+7FHo8Kss/Ef89zjtvb/t93ukPSrQj7is+yqOf8OTSOWEWatFVT5d SOm69jk6ZvZmIcHmi0osxRmJhlrMRcWJANrHcBm3AgAA Cc: amdragon@mit.edu 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: Thu, 12 May 2011 13:14:53 -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 eaf5051..9b56406 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