--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 06F9F431FAF\r
+ for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 14:56:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id hOXe9M0y8WiX for <notmuch@notmuchmail.org>;\r
+ Wed, 26 Mar 2014 14:56:47 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id A0F84431FBD\r
+ for <notmuch@notmuchmail.org>; Wed, 26 Mar 2014 14:56:47 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1WSvoN-0004oX-6R; Wed, 26 Mar 2014 21:56:42 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1WSvoM-0007uq-PX; Wed, 26 Mar 2014 21:56:38 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org, david@tethera.net\r
+Subject: Re: [PATCH] test: conditionally test help system depending on\r
+ configured support\r
+In-Reply-To: <1395823692-30311-1-git-send-email-jani@nikula.org>\r
+References: <1395823692-30311-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 26 Mar 2014 21:56:37 +0000\r
+Message-ID: <877g7gipyi.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 1c5067b45e72ed68f127cc7151fb6e4e (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 26 Mar 2014 21:56:56 -0000\r
+\r
+\r
+LGTM +1 (and tests pass on one of my systems that does not have sphinx\r
+or rst2man)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Wed, 26 Mar 2014, Jani Nikula <jani@nikula.org> wrote:\r
+> If neither sphinx nor rst2man is available, the notmuch man pages will\r
+> not be available. Take this into account in the help system test.\r
+> ---\r
+> test/Makefile.local | 8 ++++++++\r
+> test/T010-help-test.sh | 12 ++++++++++--\r
+> 2 files changed, 18 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/test/Makefile.local b/test/Makefile.local\r
+> index 2b18bdb..987441f 100644\r
+> --- a/test/Makefile.local\r
+> +++ b/test/Makefile.local\r
+> @@ -42,10 +42,18 @@ else\r
+> ln -sf /bin/false $@\r
+> endif\r
+> \r
+> +$(dir)/have-man: Makefile.config\r
+> +ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)\r
+> + ln -sf /bin/false $@\r
+> +else\r
+> + ln -sf /bin/true $@\r
+> +endif\r
+> +\r
+> .PHONY: test check\r
+> \r
+> TEST_BINARIES=$(dir)/arg-test \\r
+> $(dir)/have-compact \\r
+> + $(dir)/have-man \\r
+> $(dir)/hex-xcode \\r
+> $(dir)/random-corpus \\r
+> $(dir)/parse-time \\r
+> diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh\r
+> index f7df725..77410bc 100755\r
+> --- a/test/T010-help-test.sh\r
+> +++ b/test/T010-help-test.sh\r
+> @@ -4,9 +4,17 @@ test_description="online help"\r
+> . ./test-lib.sh\r
+> \r
+> test_expect_success 'notmuch --help' 'notmuch --help'\r
+> -test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
+> test_expect_success 'notmuch help' 'notmuch help'\r
+> -test_expect_success 'notmuch help tag' 'notmuch help tag'\r
+> test_expect_success 'notmuch --version' 'notmuch --version'\r
+> \r
+> +if ${TEST_DIRECTORY}/have-man; then\r
+> + test_expect_success 'notmuch --help tag' 'notmuch --help tag'\r
+> + test_expect_success 'notmuch help tag' 'notmuch help tag'\r
+> +else\r
+> + test_expect_success 'notmuch --help tag (man pages not available)' \\r
+> + 'test_must_fail notmuch --help tag'\r
+> + test_expect_success 'notmuch help tag (man pages not available)' \\r
+> + 'test_must_fail notmuch help tag'\r
+> +fi\r
+> +\r
+> test_done\r
+> -- \r
+> 1.7.2.5\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff