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 1FBF1431FAF
\r
6 for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 05:51:30 -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 g24-KK7mzAaK for <notmuch@notmuchmail.org>;
\r
17 Sun, 15 Jan 2012 05:51:29 -0800 (PST)
\r
18 Received: from mail-bk0-f53.google.com (mail-bk0-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 5C7AD431FAE
\r
22 for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 05:51:29 -0800 (PST)
\r
23 Received: by bkat2 with SMTP id t2so3965080bka.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 15 Jan 2012 05:51:26 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:cc:subject:in-reply-to:references:user-agent:date
\r
27 :message-id:mime-version:content-type;
\r
28 bh=48FsKfRheU59cyPLH7WXN4mfPP5k6uXD1agAgBegMrs=;
\r
29 b=gpB0jTRsqFKOBMjANqpNv8Er7cbCYEoZZTp9KBc7wV4c/V5txIfUbKLfzGBOiN4l9d
\r
30 dQjCZzB4hAeMQZwQXaC1FyhCHxfiJZVfze/axXMjOsMS3+aW99oNeMxjTLjEMk1bZcBe
\r
31 bDx0bHyBNR+7Q2N1kveH2VCmqnoKIn4i8rUyM=
\r
32 Received: by 10.205.127.65 with SMTP id gz1mr3451032bkc.12.1326635486673;
\r
33 Sun, 15 Jan 2012 05:51:26 -0800 (PST)
\r
34 Received: from localhost ([91.144.186.21])
\r
35 by mx.google.com with ESMTPS id ek9sm1591532bkb.10.2012.01.15.05.51.24
\r
36 (version=TLSv1/SSLv3 cipher=OTHER);
\r
37 Sun, 15 Jan 2012 05:51:25 -0800 (PST)
\r
38 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
39 To: Pieter Praet <pieter@praet.org>
\r
40 Subject: Re: [PATCH] test: don't bail out of `run_emacs' too early when
\r
42 In-Reply-To: <1326532177-19167-1-git-send-email-pieter@praet.org>
\r
43 References: <87mx9qps82.fsf@praet.org>
\r
44 <1326532177-19167-1-git-send-email-pieter@praet.org>
\r
45 User-Agent: Notmuch/0.10.2+135~gb811a3c (http://notmuchmail.org) Emacs/23.3.1
\r
46 (x86_64-pc-linux-gnu)
\r
47 Date: Sun, 15 Jan 2012 17:50:32 +0400
\r
48 Message-ID: <8762gdnkgn.fsf@gmail.com>
\r
50 Content-Type: text/plain; charset=us-ascii
\r
51 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
52 X-BeenThere: notmuch@notmuchmail.org
\r
53 X-Mailman-Version: 2.1.13
\r
55 List-Id: "Use and development of the notmuch mail system."
\r
56 <notmuch.notmuchmail.org>
\r
57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
58 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
60 List-Post: <mailto:notmuch@notmuchmail.org>
\r
61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
64 X-List-Received-Date: Sun, 15 Jan 2012 13:51:30 -0000
\r
66 On Sat, 14 Jan 2012 10:09:37 +0100, Pieter Praet <pieter@praet.org> wrote:
\r
67 > When running the Emacs tests in verbose mode, only the first missing
\r
68 > prereq is reported because the `run_emacs' function is short-circuited
\r
72 > emacs: Testing emacs interface
\r
73 > missing prerequisites: [0] emacs(1)
\r
74 > skipping test: [0] Basic notmuch-hello view in emacs
\r
75 > SKIP [0] Basic notmuch-hello view in emacs
\r
78 > This can lead to situations reminiscent of "dependency hell", so instead
\r
79 > of returning based on each individual `test_require_external_prereq's exit
\r
80 > status, we now do so only after checking all the prereqs:
\r
83 > emacs: Testing emacs interface
\r
84 > missing prerequisites: [0] dtach(1) emacs(1) emacsclient(1)
\r
85 > skipping test: [0] Basic notmuch-hello view in emacs
\r
86 > SKIP [0] Basic notmuch-hello view in emacs
\r
89 > Also added missing prereq for dtach(1).
\r
97 > test/test-lib.sh | 7 +++++--
\r
98 > 1 files changed, 5 insertions(+), 2 deletions(-)
\r
100 > diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
101 > index 82767c0..d1fbc05 100644
\r
102 > --- a/test/test-lib.sh
\r
103 > +++ b/test/test-lib.sh
\r
104 > @@ -907,8 +907,11 @@ EOF
\r
107 > # test dependencies beforehand to avoid the waiting loop below
\r
108 > - test_require_external_prereq emacs || return
\r
109 > - test_require_external_prereq emacsclient || return
\r
110 > + missing_dependencies=
\r
111 > + test_require_external_prereq dtach || missing_dependencies=1
\r
112 > + test_require_external_prereq emacs || missing_dependencies=1
\r
113 > + test_require_external_prereq emacsclient || missing_dependencies=1
\r
114 > + test -z "$missing_dependencies" || return
\r
116 > if [ -z "$EMACS_SERVER" ]; then
\r
117 > server_name="notmuch-test-suite-$$"
\r