From: Mike Kelly Date: Wed, 30 May 2012 07:02:00 +0000 (+2000) Subject: [PATCH v2 5/9] tests: Test against source man pages. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aeff02c73ac79507a1282a2976a93f7970a8d17f;p=notmuch-archives.git [PATCH v2 5/9] tests: Test against source man pages. --- diff --git a/44/732bc5b6dfd428447d893e794b4ba76b769633 b/44/732bc5b6dfd428447d893e794b4ba76b769633 new file mode 100644 index 000000000..b965400b0 --- /dev/null +++ b/44/732bc5b6dfd428447d893e794b4ba76b769633 @@ -0,0 +1,107 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id DC197431FCB + for ; Wed, 30 May 2012 00:02:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id IamFvxArG9iT for ; + Wed, 30 May 2012 00:02:56 -0700 (PDT) +Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com + [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 6BB55431FC3 + for ; Wed, 30 May 2012 00:02:55 -0700 (PDT) +Received: by mail-vb0-f53.google.com with SMTP id fc26so4786695vbb.26 + for ; Wed, 30 May 2012 00:02:55 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :x-gm-message-state; + bh=2gDamEdv1PIzw0NMD/J3Em878Q5/vJXO9kIDX1yUL34=; + b=AlvKPSHNGWn/5jhgAslE7wFXr3A3mwxgoiudQVWsgt0GXB6h8NPtIkIzcg8lzmEoL/ + UnLyWqTfvlm/cxEorhvQToywtQzkAW9zskhUxQSNHJ7/FyHSupzK1vTUOlj5rSZfb6Wx + iYFd6ff6W+KK5KGzeVRVguMRBFJRM3jH6nLe3Au0IDLLzN7XtfMEKWscyPes1JvZ+Ztd + DXCSf+P9Ui9MhyGHySpdfHl51WAJiXdFv7n0WBDbFVilSk2aDdjPeTfbGwa8Qd3+IqRM + BOeE2i1/JK5PU5bCrHaXEO+MiCEtV1AWrbs7mFGpRdGI4x6PImyY8Y5HvNGDrIVJ+74k + znqg== +Received: by 10.220.107.130 with SMTP id b2mr15840866vcp.35.1338361374951; + Wed, 30 May 2012 00:02:54 -0700 (PDT) +Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net. + [71.182.155.97]) + by mx.google.com with ESMTPS id g10sm28333962vdk.2.2012.05.30.00.02.54 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 30 May 2012 00:02:54 -0700 (PDT) +Received: by nas.home.pioto.org (Postfix, from userid 1001) + id 560A3287E4; Wed, 30 May 2012 03:02:52 -0400 (EDT) +From: Mike Kelly +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/9] tests: Test against source man pages. +Date: Wed, 30 May 2012 03:02:00 -0400 +Message-Id: <1338361324-57289-6-git-send-email-pioto@pioto.org> +X-Mailer: git-send-email 1.7.10.2 +In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org> +References: <1338361324-57289-1-git-send-email-pioto@pioto.org> +X-Gm-Message-State: + ALoCoQnhMi0BuylnjDiDhwQ06z+X6hBca+YxZlwrMqWZkG/fk307Jz66l8SDNTNfPaMqLmfCq929 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 30 May 2012 07:02:57 -0000 + +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 +