[PATCH v2 5/9] tests: Test against source man pages.

diff --git a/44/732bc5b6dfd428447d893e794b4ba76b769633 b/44/732bc5b6dfd428447d893e794b4ba76b769633
new file mode 100644 (file)
index 0000000..b965400
--- /dev/null
+++ b/44/732bc5b6dfd428447d893e794b4ba76b769633
@@ -0,0 +1,107 @@
+Return-Path: <pioto@pioto.org>\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 DC197431FCB\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 IamFvxArG9iT for <notmuch@notmuchmail.org>;\r
+       Wed, 30 May 2012 00:02:56 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6BB55431FC3\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+Received: by mail-vb0-f53.google.com with SMTP id fc26so4786695vbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=2gDamEdv1PIzw0NMD/J3Em878Q5/vJXO9kIDX1yUL34=;\r
+       b=AlvKPSHNGWn/5jhgAslE7wFXr3A3mwxgoiudQVWsgt0GXB6h8NPtIkIzcg8lzmEoL/\r
+       UnLyWqTfvlm/cxEorhvQToywtQzkAW9zskhUxQSNHJ7/FyHSupzK1vTUOlj5rSZfb6Wx\r
+       iYFd6ff6W+KK5KGzeVRVguMRBFJRM3jH6nLe3Au0IDLLzN7XtfMEKWscyPes1JvZ+Ztd\r
+       DXCSf+P9Ui9MhyGHySpdfHl51WAJiXdFv7n0WBDbFVilSk2aDdjPeTfbGwa8Qd3+IqRM\r
+       BOeE2i1/JK5PU5bCrHaXEO+MiCEtV1AWrbs7mFGpRdGI4x6PImyY8Y5HvNGDrIVJ+74k\r
+       znqg==\r
+Received: by 10.220.107.130 with SMTP id b2mr15840866vcp.35.1338361374951;\r
+       Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id g10sm28333962vdk.2.2012.05.30.00.02.54\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 30 May 2012 00:02:54 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 560A3287E4; Wed, 30 May 2012 03:02:52 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/9] tests: Test against source man pages.\r
+Date: Wed, 30 May 2012 03:02:00 -0400\r
+Message-Id: <1338361324-57289-6-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+References: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnhMi0BuylnjDiDhwQ06z+X6hBca+YxZlwrMqWZkG/fk307Jz66l8SDNTNfPaMqLmfCq929\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, 30 May 2012 07:02:57 -0000\r
+\r
+Without this, help-test tests against the installed man pages, rather\r
+than the default ones.\r
+---\r
+ test/test-lib.sh |   11 ++++++++---\r
+ 1 file changed, 8 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 06aaea2..da792b7 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1061,6 +1061,7 @@ find_notmuch_path ()\r
+ # Test the binaries we have just built.  The tests are kept in\r
+ # test/ subdirectory and are run in 'trash directory' subdirectory.\r
+ TEST_DIRECTORY=$(pwd)\r
++notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`\r
+ if test -n "$valgrind"\r
+ then\r
+       make_symlink () {\r
+@@ -1121,11 +1122,15 @@ then\r
+       PATH=$GIT_VALGRIND/bin:$PATH\r
+       GIT_EXEC_PATH=$GIT_VALGRIND/bin\r
+       export GIT_VALGRIND\r
++      test -n "$notmuch_path" && MANPATH="$notmuch_path/man:$MANPATH"\r
+ else # normal case\r
+-      notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"`\r
+-      test -n "$notmuch_path" && PATH="$notmuch_path:$PATH"\r
++      if test -n "$notmuch_path"\r
++              then\r
++                      PATH="$notmuch_path:$PATH"\r
++                      MANPATH="$notmuch_path/man:$MANPATH"\r
++              fi\r
+ fi\r
+-export PATH\r
++export PATH MANPATH\r
+ \r
+ # Test repository\r
+ test="tmp.$(basename "$0" .sh)"\r
+-- \r
+1.7.10.2\r
+\r