From: Mike Kelly <pioto@pioto.org>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 5/9] tests: Test against source man pages.
Date: Wed, 30 May 2012 03:02:00 -0400 [thread overview]
Message-ID: <1338361324-57289-6-git-send-email-pioto@pioto.org> (raw)
In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>
Without this, help-test tests against the installed man pages, rather
than the default ones.
---
test/test-lib.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 06aaea2..da792b7 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1061,6 +1061,7 @@ find_notmuch_path ()
# Test the binaries we have just built. The tests are kept in
# test/ subdirectory and are run in 'trash directory' subdirectory.
TEST_DIRECTORY=$(pwd)
+notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
if test -n "$valgrind"
then
make_symlink () {
@@ -1121,11 +1122,15 @@ then
PATH=$GIT_VALGRIND/bin:$PATH
GIT_EXEC_PATH=$GIT_VALGRIND/bin
export GIT_VALGRIND
+ test -n "$notmuch_path" && MANPATH="$notmuch_path/man:$MANPATH"
else # normal case
- notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
- test -n "$notmuch_path" && PATH="$notmuch_path:$PATH"
+ if test -n "$notmuch_path"
+ then
+ PATH="$notmuch_path:$PATH"
+ MANPATH="$notmuch_path/man:$MANPATH"
+ fi
fi
-export PATH
+export PATH MANPATH
# Test repository
test="tmp.$(basename "$0" .sh)"
--
1.7.10.2
next prev parent reply other threads:[~2012-05-30 7:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 7:01 [PATCH v2 0/9] FreeBSD Support Patches Mike Kelly
2012-05-30 7:01 ` [PATCH v2 1/9] configure: Add support for FreeBSD Mike Kelly
2012-05-30 7:01 ` [PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test Mike Kelly
2012-05-30 7:01 ` [PATCH v2 3/9] Makefile.local: define _GNU_SOURCE Mike Kelly
2012-05-31 8:14 ` Jani Nikula
2012-05-30 7:01 ` [PATCH v2 4/9] test/smtp-dummy.c: fix compilation on FreeBSD Mike Kelly
2012-05-30 7:02 ` Mike Kelly [this message]
2012-05-30 7:02 ` [PATCH v2 6/9] test/basic: use portable args for find Mike Kelly
2012-05-30 7:02 ` [PATCH v2 7/9] test/count: fix numeric comparision tests on FreeBSD Mike Kelly
2012-05-30 20:28 ` Jameson Graef Rollins
2012-05-30 21:00 ` Tomi Ollila
2012-05-31 8:28 ` Jani Nikula
2012-05-30 7:02 ` [PATCH v2 8/9] test/atomicity: use a more portable 'cp' form Mike Kelly
2012-05-30 7:02 ` [PATCH v2 9/9] tests: bsd sed doesn't allow replacing '\n' Mike Kelly
2012-05-30 10:35 ` [PATCH v2 0/9] FreeBSD Support Patches Tomi Ollila
2012-09-02 2:41 ` David Bremner
2012-09-04 22:45 ` Mike Kelly
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=1338361324-57289-6-git-send-email-pioto@pioto.org \
--to=pioto@pioto.org \
--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).