3a/ea5e2f735932ea740e67ffa66afb1a1db5c9d2

   1 Return-Path: <dmitry.kurochkin@gmail.com>\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 7F0E9429E36\r
   6         for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:06:37 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id CAiHOMzu6y0x for <notmuch@notmuchmail.org>;\r
  17         Thu, 17 Nov 2011 05:06:36 -0800 (PST)\r
  18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
  19         [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 033B9429E3D\r
  22         for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:06:35 -0800 (PST)\r
  23 Received: by mail-bw0-f53.google.com with SMTP id q10so2108356bka.26\r
  24         for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 05:06:35 -0800 (PST)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;\r
  27         bh=6iq1cnVGQjcniJbmuVne/FIMWOif8YhODVowsUzQRoc=;\r
  28         b=J0WyskDZwbMuBZxrb0voEgChYffxXgSKdsFpt6TCOrfdxqto/17761Uz/il8sukwO/\r
  29         E2ofDyfijlxJ5CTDB1lLwN0xsDZ3MWNI6/uYMMEmG8beCc4tmhB7G0WIF/mLdVZmlbvU\r
  30         DzNH4OaTvO8Qa3ylTR/yRvD7Ldbu48qkGoBcQ=\r
  31 Received: by 10.205.138.129 with SMTP id is1mr26248696bkc.120.1321535195712;\r
  32         Thu, 17 Nov 2011 05:06:35 -0800 (PST)\r
  33 Received: from localhost ([91.144.186.21])\r
  34         by mx.google.com with ESMTPS id r12sm41225675bkw.5.2011.11.17.05.06.34\r
  35         (version=TLSv1/SSLv3 cipher=OTHER);\r
  36         Thu, 17 Nov 2011 05:06:35 -0800 (PST)\r
  37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2 05/10] test: fix "skipping test" verbose output\r
  40 Date: Thu, 17 Nov 2011 17:05:58 +0400\r
  41 Message-Id: <1321535163-4895-6-git-send-email-dmitry.kurochkin@gmail.com>\r
  42 X-Mailer: git-send-email 1.7.7.2\r
  43 In-Reply-To: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  44 References: <1321535163-4895-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  45 X-BeenThere: notmuch@notmuchmail.org\r
  46 X-Mailman-Version: 2.1.13\r
  47 Precedence: list\r
  48 List-Id: "Use and development of the notmuch mail system."\r
  49         <notmuch.notmuchmail.org>\r
  50 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  51         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  52 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  53 List-Post: <mailto:notmuch@notmuchmail.org>\r
  54 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  55 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  57 X-List-Received-Date: Thu, 17 Nov 2011 13:06:37 -0000\r
  58 \r
  59 ---\r
  60  test/test-lib.sh |    3 ++-\r
  61  1 files changed, 2 insertions(+), 1 deletions(-)\r
  62 \r
  63 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  64 index 625d19b..ce7576a 100755\r
  65 --- a/test/test-lib.sh\r
  66 +++ b/test/test-lib.sh\r
  67 @@ -635,41 +635,42 @@ test_skip () {\r
  68                 test_report_skip_ "$@"\r
  69                 ;;\r
  70         *)\r
  71                 test_check_missing_external_prereqs_ "$@"\r
  72                 ;;\r
  73         esac\r
  74  }\r
  75  \r
  76  test_check_missing_external_prereqs_ () {\r
  77         if test -n "$test_subtest_missing_external_prereqs_"; then\r
  78                 say_color skip >&3 "missing prerequisites:"\r
  79                 echo "$test_subtest_missing_external_prereqs_" >&3\r
  80                 test_report_skip_ "$@"\r
  81         else\r
  82                 false\r
  83         fi\r
  84  }\r
  85  \r
  86  test_report_skip_ () {\r
  87         test_reset_state_\r
  88 -       say_color skip >&3 "skipping test: $@"\r
  89 +       say_color skip >&3 "skipping test:"\r
  90 +       echo " $@" >&3\r
  91         say_color skip "%-6s" "SKIP"\r
  92         echo " $1"\r
  93  }\r
  94  \r
  95  test_subtest_known_broken () {\r
  96         test_subtest_known_broken_=t\r
  97  }\r
  98  \r
  99  test_expect_success () {\r
 100         test "$#" = 3 && { prereq=$1; shift; } || prereq=\r
 101         test "$#" = 2 ||\r
 102         error "bug in the test script: not 2 or 3 parameters to test-expect-success"\r
 103         test_reset_state_\r
 104         if ! test_skip "$@"\r
 105         then\r
 106                 test_run_ "$2"\r
 107                 run_ret="$?"\r
 108                 # test_run_ may update missing external prerequisites\r
 109                 test_check_missing_external_prereqs_ "$@" ||\r
 110                 if [ "$run_ret" = 0 -a "$eval_ret" = 0 ]\r
 111 -- \r
 112 1.7.7.2\r
 113 \r