75/53adf43d9cea4b0bf1723cc4dd33caf8ded5c9

   1 Return-Path: <jani@nikula.org>\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 11193431FBF\r
   6         for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 01:48:22 -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 Lr2013GymXSH for <notmuch@notmuchmail.org>;\r
  16         Wed, 26 Mar 2014 01:48:17 -0700 (PDT)\r
  17 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com\r
  18  [74.125.82.41])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  C60B8431FBD    for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 01:48:16 -0700\r
  21  (PDT)\r
  22 Received: by mail-wg0-f41.google.com with SMTP id n12so1056846wgh.0\r
  23         for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 01:48:14 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
  27         bh=ewpgj3lEqjFw/fwnOi8el2jizbWQtCmLjXVvOBJ5EUs=;\r
  28         b=dXLMJ9nGJh/Vr6rZMD+0g14K+Nar+fjxE01sNir7upPeIQOwEyptXw0D7AN2UMguri\r
  29         ZdQzLbaREkb7tSZ3Iaiz9Qx/Oo6TzsnutKjStXq27xJbzEAvaKNdsEsHEB6gsrmmNMRg\r
  30         +SLOZ32Id/qNunUsDMt0sSYU2A4Xmgn5fJy6Q7GKfXSMTTnFsXgXkwvwpOudF1R1d2kn\r
  31         8iP63IhR7S6AZ+cQUMDQrqIO8wsJpVVHszgum8fA6hXXVLICBysVUYsZReNIa7a8txf6\r
  32         qgIa0NXblX+f+/iyRAk8zA5yXceKN5btlCrNCpNBe++LgjK6A2NSISiDG2X7dBgcShBB\r
  33         0fIA==\r
  34 X-Gm-Message-State:\r
  35  ALoCoQlYIbF7CIj/3rylKShmi/CJlJ00FEeGWbVoNr8JYOID4q8uLXJB026tAPyX6m+ahZ7w7pXo\r
  36 X-Received: by 10.180.8.170 with SMTP id s10mr29119522wia.35.1395823694018;\r
  37         Wed, 26 Mar 2014 01:48:14 -0700 (PDT)\r
  38 Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
  39         by mx.google.com with ESMTPSA id w10sm754158wiy.9.2014.03.26.01.48.12\r
  40         for <multiple recipients>\r
  41         (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
  42         Wed, 26 Mar 2014 01:48:13 -0700 (PDT)\r
  43 From: Jani Nikula <jani@nikula.org>\r
  44 To: notmuch@notmuchmail.org,\r
  45         david@tethera.net\r
  46 Subject: [PATCH] test: conditionally test help system depending on configured\r
  47         support\r
  48 Date: Wed, 26 Mar 2014 09:48:12 +0100\r
  49 Message-Id: <1395823692-30311-1-git-send-email-jani@nikula.org>\r
  50 X-Mailer: git-send-email 1.7.2.5\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Wed, 26 Mar 2014 08:48:22 -0000\r
  64 \r
  65 If neither sphinx nor rst2man is available, the notmuch man pages will\r
  66 not be available. Take this into account in the help system test.\r
  67 ---\r
  68  test/Makefile.local    |    8 ++++++++\r
  69  test/T010-help-test.sh |   12 ++++++++++--\r
  70  2 files changed, 18 insertions(+), 2 deletions(-)\r
  71 \r
  72 diff --git a/test/Makefile.local b/test/Makefile.local\r
  73 index 2b18bdb..987441f 100644\r
  74 --- a/test/Makefile.local\r
  75 +++ b/test/Makefile.local\r
  76 @@ -42,10 +42,18 @@ else\r
  77         ln -sf /bin/false $@\r
  78  endif\r
  79  \r
  80 +$(dir)/have-man: Makefile.config\r
  81 +ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)\r
  82 +       ln -sf /bin/false $@\r
  83 +else\r
  84 +       ln -sf /bin/true $@\r
  85 +endif\r
  86 +\r
  87  .PHONY: test check\r
  88  \r
  89  TEST_BINARIES=$(dir)/arg-test \\r
  90               $(dir)/have-compact \\r
  91 +             $(dir)/have-man \\r
  92               $(dir)/hex-xcode \\r
  93               $(dir)/random-corpus \\r
  94               $(dir)/parse-time \\r
  95 diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh\r
  96 index f7df725..77410bc 100755\r
  97 --- a/test/T010-help-test.sh\r
  98 +++ b/test/T010-help-test.sh\r
  99 @@ -4,9 +4,17 @@ test_description="online help"\r
 100  . ./test-lib.sh\r
 101  \r
 102  test_expect_success 'notmuch --help' 'notmuch --help'\r
 103 -test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
 104  test_expect_success 'notmuch help' 'notmuch help'\r
 105 -test_expect_success 'notmuch help tag' 'notmuch help tag'\r
 106  test_expect_success 'notmuch --version' 'notmuch --version'\r
 107  \r
 108 +if ${TEST_DIRECTORY}/have-man; then\r
 109 +    test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
 110 +    test_expect_success 'notmuch help tag' 'notmuch help tag'\r
 111 +else\r
 112 +    test_expect_success 'notmuch --help tag (man pages not available)' \\r
 113 +       'test_must_fail notmuch --help tag'\r
 114 +    test_expect_success 'notmuch help tag (man pages not available)' \\r
 115 +       'test_must_fail notmuch help tag'\r
 116 +fi\r
 117 +\r
 118  test_done\r
 119 -- \r
 120 1.7.2.5\r
 121 \r