From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org, david@tethera.net
Subject: [PATCH] test: conditionally test help system depending on configured support
Date: Wed, 26 Mar 2014 09:48:12 +0100 [thread overview]
Message-ID: <1395823692-30311-1-git-send-email-jani@nikula.org> (raw)
If neither sphinx nor rst2man is available, the notmuch man pages will
not be available. Take this into account in the help system test.
---
test/Makefile.local | 8 ++++++++
test/T010-help-test.sh | 12 ++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/test/Makefile.local b/test/Makefile.local
index 2b18bdb..987441f 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -42,10 +42,18 @@ else
ln -sf /bin/false $@
endif
+$(dir)/have-man: Makefile.config
+ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)
+ ln -sf /bin/false $@
+else
+ ln -sf /bin/true $@
+endif
+
.PHONY: test check
TEST_BINARIES=$(dir)/arg-test \
$(dir)/have-compact \
+ $(dir)/have-man \
$(dir)/hex-xcode \
$(dir)/random-corpus \
$(dir)/parse-time \
diff --git a/test/T010-help-test.sh b/test/T010-help-test.sh
index f7df725..77410bc 100755
--- a/test/T010-help-test.sh
+++ b/test/T010-help-test.sh
@@ -4,9 +4,17 @@ test_description="online help"
. ./test-lib.sh
test_expect_success 'notmuch --help' 'notmuch --help'
-test_expect_success 'notmuch --help tag' 'notmuch --help tag'
test_expect_success 'notmuch help' 'notmuch help'
-test_expect_success 'notmuch help tag' 'notmuch help tag'
test_expect_success 'notmuch --version' 'notmuch --version'
+if ${TEST_DIRECTORY}/have-man; then
+ test_expect_success 'notmuch --help tag' 'notmuch --help tag'
+ test_expect_success 'notmuch help tag' 'notmuch help tag'
+else
+ test_expect_success 'notmuch --help tag (man pages not available)' \
+ 'test_must_fail notmuch --help tag'
+ test_expect_success 'notmuch help tag (man pages not available)' \
+ 'test_must_fail notmuch help tag'
+fi
+
test_done
--
1.7.2.5
next reply other threads:[~2014-03-26 8:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-26 8:48 Jani Nikula [this message]
2014-03-26 10:58 ` [PATCH] test: conditionally test help system depending on configured support David Bremner
2014-03-26 21:56 ` Mark Walters
2014-03-27 0:40 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395823692-30311-1-git-send-email-jani@nikula.org \
--to=jani@nikula.org \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).