1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 5B202429E2E
\r
6 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id nIsUb2ANpD2D for <notmuch@notmuchmail.org>;
\r
17 Sun, 27 Nov 2011 10:36:54 -0800 (PST)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 505AE429E28
\r
22 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:54 -0800 (PST)
\r
23 Received: by mail-bw0-f53.google.com with SMTP id q10so8006916bka.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 27 Nov 2011 10:36:54 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=MYEfKUu9RreAzy70Q8KazGqbw0jC3RgnIW6FcZereO4=;
\r
28 b=c393Zz8hIRUFRMKlxDBfpOETCQ4C0DHPmFgfDkI7zwfsH5ZIjH+y2tX+1DUgwZriuM
\r
29 FeIubXZF5KCTzANsVeUK/uiY8zWJpIhUhdmP74psUf0FrDR2z4EbNOIRsN4GP3sh+X95
\r
30 JpJCJ02DD7EQhjwSysvPzObf8MmKPoaFR3uVE=
\r
31 Received: by 10.205.126.13 with SMTP id gu13mr42235634bkc.114.1322419014021;
\r
32 Sun, 27 Nov 2011 10:36:54 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id cc2sm25119627bkb.8.2011.11.27.10.36.53
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Sun, 27 Nov 2011 10:36:53 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v3 5/7] test: add function to explicitly check for external
\r
41 Date: Sun, 27 Nov 2011 22:36:17 +0400
\r
42 Message-Id: <1322418979-19180-6-git-send-email-dmitry.kurochkin@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.7.3
\r
44 In-Reply-To: <1322418979-19180-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 References: <87pqgd7d23.fsf@rocinante.cs.unb.ca>
\r
46 <1322418979-19180-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
47 X-BeenThere: notmuch@notmuchmail.org
\r
48 X-Mailman-Version: 2.1.13
\r
50 List-Id: "Use and development of the notmuch mail system."
\r
51 <notmuch.notmuchmail.org>
\r
52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
55 List-Post: <mailto:notmuch@notmuchmail.org>
\r
56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
59 X-List-Received-Date: Sun, 27 Nov 2011 18:36:55 -0000
\r
61 Useful when binary is called indirectly (e.g. from emacs).
\r
63 test/test-lib.sh | 14 ++++++++++++++
\r
64 1 files changed, 14 insertions(+), 0 deletions(-)
\r
66 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
67 index fe80e89..2422e32 100644
\r
68 --- a/test/test-lib.sh
\r
69 +++ b/test/test-lib.sh
\r
70 @@ -555,12 +555,26 @@ test_declare_external_prereq () {
\r
72 hash $binary 2>/dev/null || eval "
\r
74 + test_missing_external_prereq_${binary}_=t
\r
75 echo -n \"\$test_subtest_missing_external_prereqs_\" | grep -e \" $name \" ||
\r
76 test_subtest_missing_external_prereqs_=\"$test_subtest_missing_external_prereqs_ $name\"
\r
81 +# Explicitly require external prerequisite. Useful when binary is
\r
82 +# called indirectly (e.g. from emacs).
\r
83 +# Returns success if dependency is available, failure otherwise.
\r
84 +test_require_external_prereq () {
\r
86 + if [ "$(eval echo -n \$test_missing_external_prereq_${binary}_)" = t ]; then
\r
87 + # dependency is missing, call the replacement function to note it
\r
94 # You are not expected to call test_ok_ and test_failure_ directly, use
\r
95 # the text_expect_* functions instead.
\r