1 Return-Path: <pioto@pioto.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 DC197431FCB
\r
6 for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:56 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 IamFvxArG9iT for <notmuch@notmuchmail.org>;
\r
16 Wed, 30 May 2012 00:02:56 -0700 (PDT)
\r
17 Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com
\r
18 [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 6BB55431FC3
\r
21 for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)
\r
22 Received: by mail-vb0-f53.google.com with SMTP id fc26so4786695vbb.26
\r
23 for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
27 :x-gm-message-state;
\r
28 bh=2gDamEdv1PIzw0NMD/J3Em878Q5/vJXO9kIDX1yUL34=;
\r
29 b=AlvKPSHNGWn/5jhgAslE7wFXr3A3mwxgoiudQVWsgt0GXB6h8NPtIkIzcg8lzmEoL/
\r
30 UnLyWqTfvlm/cxEorhvQToywtQzkAW9zskhUxQSNHJ7/FyHSupzK1vTUOlj5rSZfb6Wx
\r
31 iYFd6ff6W+KK5KGzeVRVguMRBFJRM3jH6nLe3Au0IDLLzN7XtfMEKWscyPes1JvZ+Ztd
\r
32 DXCSf+P9Ui9MhyGHySpdfHl51WAJiXdFv7n0WBDbFVilSk2aDdjPeTfbGwa8Qd3+IqRM
\r
33 BOeE2i1/JK5PU5bCrHaXEO+MiCEtV1AWrbs7mFGpRdGI4x6PImyY8Y5HvNGDrIVJ+74k
\r
35 Received: by 10.220.107.130 with SMTP id b2mr15840866vcp.35.1338361374951;
\r
36 Wed, 30 May 2012 00:02:54 -0700 (PDT)
\r
37 Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.
\r
39 by mx.google.com with ESMTPS id g10sm28333962vdk.2.2012.05.30.00.02.54
\r
40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
41 Wed, 30 May 2012 00:02:54 -0700 (PDT)
\r
42 Received: by nas.home.pioto.org (Postfix, from userid 1001)
\r
43 id 560A3287E4; Wed, 30 May 2012 03:02:52 -0400 (EDT)
\r
44 From: Mike Kelly <pioto@pioto.org>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: [PATCH v2 5/9] tests: Test against source man pages.
\r
47 Date: Wed, 30 May 2012 03:02:00 -0400
\r
48 Message-Id: <1338361324-57289-6-git-send-email-pioto@pioto.org>
\r
49 X-Mailer: git-send-email 1.7.10.2
\r
50 In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>
\r
51 References: <1338361324-57289-1-git-send-email-pioto@pioto.org>
\r
53 ALoCoQnhMi0BuylnjDiDhwQ06z+X6hBca+YxZlwrMqWZkG/fk307Jz66l8SDNTNfPaMqLmfCq929
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Wed, 30 May 2012 07:02:57 -0000
\r
68 Without this, help-test tests against the installed man pages, rather
\r
69 than the default ones.
\r
71 test/test-lib.sh | 11 ++++++++---
\r
72 1 file changed, 8 insertions(+), 3 deletions(-)
\r
74 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
75 index 06aaea2..da792b7 100644
\r
76 --- a/test/test-lib.sh
\r
77 +++ b/test/test-lib.sh
\r
78 @@ -1061,6 +1061,7 @@ find_notmuch_path ()
\r
79 # Test the binaries we have just built. The tests are kept in
\r
80 # test/ subdirectory and are run in 'trash directory' subdirectory.
\r
81 TEST_DIRECTORY=$(pwd)
\r
82 +notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
\r
83 if test -n "$valgrind"
\r
86 @@ -1121,11 +1122,15 @@ then
\r
87 PATH=$GIT_VALGRIND/bin:$PATH
\r
88 GIT_EXEC_PATH=$GIT_VALGRIND/bin
\r
90 + test -n "$notmuch_path" && MANPATH="$notmuch_path/man:$MANPATH"
\r
92 - notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`
\r
93 - test -n "$notmuch_path" && PATH="$notmuch_path:$PATH"
\r
94 + if test -n "$notmuch_path"
\r
96 + PATH="$notmuch_path:$PATH"
\r
97 + MANPATH="$notmuch_path/man:$MANPATH"
\r
101 +export PATH MANPATH
\r
104 test="tmp.$(basename "$0" .sh)"
\r