1 Return-Path: <m.walters@qmul.ac.uk>
\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 06F9F431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 14:56:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5
\r
12 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,
\r
13 NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 hOXe9M0y8WiX for <notmuch@notmuchmail.org>;
\r
17 Wed, 26 Mar 2014 14:56:47 -0700 (PDT)
\r
18 Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id A0F84431FBD
\r
22 for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 14:56:47 -0700 (PDT)
\r
23 Received: from smtp.qmul.ac.uk ([138.37.6.40])
\r
24 by mail2.qmul.ac.uk with esmtp (Exim 4.71)
\r
25 (envelope-from <m.walters@qmul.ac.uk>)
\r
26 id 1WSvoN-0004oX-6R; Wed, 26 Mar 2014 21:56:42 +0000
\r
27 Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)
\r
28 by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)
\r
29 (envelope-from <m.walters@qmul.ac.uk>)
\r
30 id 1WSvoM-0007uq-PX; Wed, 26 Mar 2014 21:56:38 +0000
\r
31 From: Mark Walters <markwalters1009@gmail.com>
\r
32 To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org, david@tethera.net
\r
33 Subject: Re: [PATCH] test: conditionally test help system depending on
\r
35 In-Reply-To: <1395823692-30311-1-git-send-email-jani@nikula.org>
\r
36 References: <1395823692-30311-1-git-send-email-jani@nikula.org>
\r
37 User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1
\r
38 (x86_64-pc-linux-gnu)
\r
39 Date: Wed, 26 Mar 2014 21:56:37 +0000
\r
40 Message-ID: <877g7gipyi.fsf@qmul.ac.uk>
\r
42 Content-Type: text/plain; charset=us-ascii
\r
43 X-Sender-Host-Address: 93.97.24.31
\r
44 X-QM-Geographic: According to ripencc,
\r
45 this message was delivered by a machine in Britain (UK) (GB).
\r
46 X-QM-SPAM-Info: Sender has good ham record. :)
\r
47 X-QM-Body-MD5: 1c5067b45e72ed68f127cc7151fb6e4e (of first 20000 bytes)
\r
48 X-SpamAssassin-Score: 0.0
\r
49 X-SpamAssassin-SpamBar: /
\r
50 X-SpamAssassin-Report: The QM spam filters have analysed this message to
\r
52 spam. We require at least 5.0 points to mark a message as spam.
\r
53 This message scored 0.0 points. Summary of the scoring:
\r
54 * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
\r
55 provider * (markwalters1009[at]gmail.com)
\r
56 * 0.0 AWL AWL: From: address is in the auto white-list
\r
57 X-QM-Scan-Virus: ClamAV says the message is clean
\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: Wed, 26 Mar 2014 21:56:56 -0000
\r
73 LGTM +1 (and tests pass on one of my systems that does not have sphinx
\r
80 On Wed, 26 Mar 2014, Jani Nikula <jani@nikula.org> wrote:
\r
81 > If neither sphinx nor rst2man is available, the notmuch man pages will
\r
82 > not be available. Take this into account in the help system test.
\r
84 > test/Makefile.local | 8 ++++++++
\r
85 > test/T010-help-test.sh | 12 ++++++++++--
\r
86 > 2 files changed, 18 insertions(+), 2 deletions(-)
\r
88 > diff --git a/test/Makefile.local b/test/Makefile.local
\r
89 > index 2b18bdb..987441f 100644
\r
90 > --- a/test/Makefile.local
\r
91 > +++ b/test/Makefile.local
\r
92 > @@ -42,10 +42,18 @@ else
\r
93 > ln -sf /bin/false $@
\r
96 > +$(dir)/have-man: Makefile.config
\r
97 > +ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)
\r
98 > + ln -sf /bin/false $@
\r
100 > + ln -sf /bin/true $@
\r
103 > .PHONY: test check
\r
105 > TEST_BINARIES=$(dir)/arg-test \
\r
106 > $(dir)/have-compact \
\r
107 > + $(dir)/have-man \
\r
108 > $(dir)/hex-xcode \
\r
109 > $(dir)/random-corpus \
\r
110 > $(dir)/parse-time \
\r
111 > diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh
\r
112 > index f7df725..77410bc 100755
\r
113 > --- a/test/T010-help-test.sh
\r
114 > +++ b/test/T010-help-test.sh
\r
115 > @@ -4,9 +4,17 @@ test_description="online help"
\r
118 > test_expect_success 'notmuch --help' 'notmuch --help'
\r
119 > -test_expect_success 'notmuch --help tag' 'notmuch --help tag'
\r
120 > test_expect_success 'notmuch help' 'notmuch help'
\r
121 > -test_expect_success 'notmuch help tag' 'notmuch help tag'
\r
122 > test_expect_success 'notmuch --version' 'notmuch --version'
\r
124 > +if ${TEST_DIRECTORY}/have-man; then
\r
125 > + test_expect_success 'notmuch --help tag' 'notmuch --help tag'
\r
126 > + test_expect_success 'notmuch help tag' 'notmuch help tag'
\r
128 > + test_expect_success 'notmuch --help tag (man pages not available)' \
\r
129 > + 'test_must_fail notmuch --help tag'
\r
130 > + test_expect_success 'notmuch help tag (man pages not available)' \
\r
131 > + 'test_must_fail notmuch help tag'
\r
138 > _______________________________________________
\r
139 > notmuch mailing list
\r
140 > notmuch@notmuchmail.org
\r
141 > http://notmuchmail.org/mailman/listinfo/notmuch
\r