1 Return-Path: <amthrax@drake.mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1688A431FD0
\r
6 for <notmuch@notmuchmail.org>; Thu, 12 May 2011 06:14:53 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id k9Hin3m0WlwQ for <notmuch@notmuchmail.org>;
\r
16 Thu, 12 May 2011 06:14:49 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 9467A431FB6
\r
20 for <notmuch@notmuchmail.org>; Thu, 12 May 2011 06:14:49 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7c4dae0000007bd-f1-4dcbdd4b98f3
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id B9.76.01981.B4DDBCD4; Thu, 12 May 2011 09:14:51 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id p4CDElV5016067;
\r
27 Thu, 12 May 2011 09:14:47 -0400
\r
28 Received: from drake.mit.edu
\r
29 (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [209.6.116.242]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p4CDEk3u005215
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Thu, 12 May 2011 09:14:47 -0400 (EDT)
\r
35 Received: from amthrax by drake.mit.edu with local (Exim 4.76)
\r
36 (envelope-from <amthrax@drake.mit.edu>)
\r
37 id 1QKVj4-0004YL-E0; Thu, 12 May 2011 09:14:46 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH] test: Fix message when skipping test_expect_equal* tests
\r
41 Date: Thu, 12 May 2011 09:14:40 -0400
\r
42 Message-Id: <1305206080-17461-1-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.5.1
\r
44 X-Brightmail-Tracker:
\r
45 H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6nrut997SvwdRGbYvrN2cyOzB6PFt1
\r
46 izmAMYrLJiU1J7MstUjfLoEr4/XJu+wFxzkqPj46ztzA+JCti5GTQ0LAROL9o9ksELaYxIV7
\r
47 68HiQgL7GCXO3nLtYuQCsjcwSnRf/scIkbjPJDFhlgKEPZ9R4tMrHRCbTUBDYtv+5WA1IgLS
\r
48 EjvvzmbtYuTgYBYQkXg3kwkkLCzgKXHt/2R2EJtFQFXixIf7YHFeAQeJr093MULcoCBx5co8
\r
49 lgmMvAsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpmujlZpbopaaUbmIEBQCnJP8Oxm8HlQ4x
\r
50 CnAwKvHwXl17yleINbGsuDL3EKMkB5OSKK/vrdO+QnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4
\r
51 pZYAlfOmJFZWpRblw6SkOViUxHlnSar7CgmkJ5akZqemFqQWwWRlODiUJHjd7wANFSxKTU+t
\r
52 SMvMKUFIM3FwggznARquC1LDW1yQmFucmQ6RP8Woy/H50aEDjEIsefl5qVLivFEgRQIgRRml
\r
53 eXBzYJH7ilEc6C1hXn2QKh5g1MNNegW0hAloifmGEyBLShIRUlINjCa8L69K/xUqm7Tx4a4v
\r
54 /3PyN8+5ctz2d9mqDZtjXt/eGy2fqxTceUMvKfO+D6srR8kXsU6zAA/zyvI3PM3/1bdVrz24
\r
55 q/XNOmNbFtYGzksXrry+7FHo8Kss/Ef89zjtvb/t93ukPSrQj7is+yqOf8OTSOWEWatFVT5d
\r
56 SOm69jk6ZvZmIcHmi0osxRmJhlrMRcWJANrHcBm3AgAA
\r
57 Cc: amdragon@mit.edu
\r
58 X-BeenThere: notmuch@notmuchmail.org
\r
59 X-Mailman-Version: 2.1.13
\r
61 List-Id: "Use and development of the notmuch mail system."
\r
62 <notmuch.notmuchmail.org>
\r
63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
66 List-Post: <mailto:notmuch@notmuchmail.org>
\r
67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
70 X-List-Received-Date: Thu, 12 May 2011 13:14:53 -0000
\r
72 For these types of tests, the test name is previously recorded in a
\r
73 variable, not passed to the test function, so pass this variable to
\r
76 test/test-lib.sh | 6 +++---
\r
77 1 files changed, 3 insertions(+), 3 deletions(-)
\r
79 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
80 index eaf5051..9b56406 100755
\r
81 --- a/test/test-lib.sh
\r
82 +++ b/test/test-lib.sh
\r
83 @@ -448,7 +448,7 @@ test_expect_equal ()
\r
87 - if ! test_skip "$@"
\r
88 + if ! test_skip "$test_subtest_name"
\r
90 if [ "$output" = "$expected" ]; then
\r
91 test_ok_ "$test_subtest_name"
\r
92 @@ -471,7 +471,7 @@ test_expect_equal_file ()
\r
96 - if ! test_skip "$@"
\r
97 + if ! test_skip "$test_subtest_name"
\r
99 if diff -q "$expected" "$output" >/dev/null ; then
\r
100 test_ok_ "$test_subtest_name"
\r
101 @@ -494,7 +494,7 @@ test_expect_equal_failure ()
\r
105 - if ! test_skip "$@"
\r
106 + if ! test_skip "$test_subtest_name"
\r
108 if [ "$output" = "$expected" ]; then
\r
109 test_known_broken_ok_ "$test_subtest_name"
\r