23/60e1ab38f71e43c04ca382f0900f26f957d9bc

   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 4A29F431FD0\r
   6         for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:49:37 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 B2iqFlJsHT4g for <notmuch@notmuchmail.org>;\r
  16         Sat, 11 Jun 2011 13:49:36 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 8710D431FB6\r
  20         for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:49:36 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7c39ae000000a8c-78-4df3d4ce96f0\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 05.1B.02700.EC4D3FD4; Sat, 11 Jun 2011 16:49:19 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BKnZah017437; \r
  27         Sat, 11 Jun 2011 16:49:35 -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 p5BKnYJY009486\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 11 Jun 2011 16:49:35 -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 1QVV7e-0000Xk-Db; Sat, 11 Jun 2011 16:49:34 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 01/17] test: Fix message when skipping test_expect_equal*\r
  41  tests\r
  42 Date: Sat, 11 Jun 2011 16:49:27 -0400\r
  43 Message-Id: <1307825367-2035-1-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.5.1\r
  45 In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrHv+ymdfg0eLGS2u35zJ7MDo8WzV\r
  49         LeYAxigum5TUnMyy1CJ9uwSujPM//jMWHOeomNet28D4kK2LkZNDQsBEounYREYIW0ziwr31\r
  50         YHEhgX2MEhsWKHcxcgHZGxgllj/axAjh3GeSWNezkA3Cmc8ocf/UOrAWNgENiW37l4ONEhGQ\r
  51         lth5dzZrFyMHB7OAmsSfLhWQsLCAv8ShnW2sIDaLgKrExV93WUBKeAXsJa5O4YA4QkHiypV5\r
  52         LCA2J1B43sGrLBAH2Uk0nN3MMoGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdY73czBK9\r
  53         1JTSTYzggJHk28H49aDSIUYBDkYlHl69tZ99hVgTy4orcw8xSnIwKYnySl4ECvEl5adUZiQW\r
  54         Z8QXleakFh9ilOBgVhLhZTkDlONNSaysSi3Kh0lJc7AoifPOlFT3FRJITyxJzU5NLUgtgsnK\r
  55         cHAoSfBmAyNDSLAoNT21Ii0zpwQhzcTBCTKcB2i4FEgNb3FBYm5xZjpE/hSjLsfjDZsOMQqx\r
  56         5OXnpUqJ8+aCFAmAFGWU5sHNgUX6K0ZxoLeEeRtBqniASQJu0iugJUxASwRKwZaUJCKkpBoY\r
  57         M5558v8/m3838tZ+zfrYKcE7Ga7zzvpyYEFAX33zoajzcs3WGeaxt75vjT5tGffy5VavnoX+\r
  58         mS8P10W7yG76EHl9O99ezvWmHNq3Wufu515d38S8JeTOhF2rt37dYeqvV6v3s8w213BFnQSP\r
  59         UHX78rv7NeOanhUY7zx/9qTq+TibrtUlV2tvK7EUZyQaajEXFScCAK3uXqfPAgAA\r
  60 Cc: Austin Clements <amdragon@mit.edu>\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sat, 11 Jun 2011 20:49:37 -0000\r
  74 \r
  75 For these types of tests, the test name is previously recorded in a\r
  76 variable, not passed to the test function, so pass this variable to\r
  77 test_skip.\r
  78 ---\r
  79  test/test-lib.sh |    6 +++---\r
  80  1 files changed, 3 insertions(+), 3 deletions(-)\r
  81 \r
  82 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  83 index a59d1c1..d0e2794 100755\r
  84 --- a/test/test-lib.sh\r
  85 +++ b/test/test-lib.sh\r
  86 @@ -448,7 +448,7 @@ test_expect_equal ()\r
  87  \r
  88         output="$1"\r
  89         expected="$2"\r
  90 -       if ! test_skip "$@"\r
  91 +       if ! test_skip "$test_subtest_name"\r
  92         then\r
  93                 if [ "$output" = "$expected" ]; then\r
  94                         test_ok_ "$test_subtest_name"\r
  95 @@ -471,7 +471,7 @@ test_expect_equal_file ()\r
  96  \r
  97         output="$1"\r
  98         expected="$2"\r
  99 -       if ! test_skip "$@"\r
 100 +       if ! test_skip "$test_subtest_name"\r
 101         then\r
 102                 if diff -q "$expected" "$output" >/dev/null ; then\r
 103                         test_ok_ "$test_subtest_name"\r
 104 @@ -494,7 +494,7 @@ test_expect_equal_failure ()\r
 105  \r
 106         output="$1"\r
 107         expected="$2"\r
 108 -       if ! test_skip "$@"\r
 109 +       if ! test_skip "$test_subtest_name"\r
 110         then\r
 111                 if [ "$output" = "$expected" ]; then\r
 112                         test_known_broken_ok_ "$test_subtest_name"\r
 113 -- \r
 114 1.7.5.1\r
 115 \r