1 Return-Path: <pieter@praet.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 9E402429E45
\r
6 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 01:11:30 -0800 (PST)
\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 uYMf27vBTEdi for <notmuch@notmuchmail.org>;
\r
16 Sat, 14 Jan 2012 01:11:30 -0800 (PST)
\r
17 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
18 [209.85.212.181]) (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 07E0D431FB6
\r
21 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 01:11:29 -0800 (PST)
\r
22 Received: by wibhr12 with SMTP id hr12so1047234wib.26
\r
23 for <notmuch@notmuchmail.org>; Sat, 14 Jan 2012 01:11:28 -0800 (PST)
\r
24 Received: by 10.180.77.35 with SMTP id p3mr7337271wiw.11.1326532288765;
\r
25 Sat, 14 Jan 2012 01:11:28 -0800 (PST)
\r
26 Received: from localhost ([109.131.75.86])
\r
27 by mx.google.com with ESMTPS id fi6sm20855900wib.2.2012.01.14.01.11.27
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Sat, 14 Jan 2012 01:11:28 -0800 (PST)
\r
30 From: Pieter Praet <pieter@praet.org>
\r
31 To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
32 Subject: [PATCH] test: don't bail out of `run_emacs' too early when missing
\r
34 Date: Sat, 14 Jan 2012 10:09:37 +0100
\r
35 Message-Id: <1326532177-19167-1-git-send-email-pieter@praet.org>
\r
36 X-Mailer: git-send-email 1.7.8.1
\r
37 In-Reply-To: <87mx9qps82.fsf@praet.org>
\r
38 References: <87mx9qps82.fsf@praet.org>
\r
39 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Sat, 14 Jan 2012 09:11:30 -0000
\r
54 When running the Emacs tests in verbose mode, only the first missing
\r
55 prereq is reported because the `run_emacs' function is short-circuited
\r
59 emacs: Testing emacs interface
\r
60 missing prerequisites: [0] emacs(1)
\r
61 skipping test: [0] Basic notmuch-hello view in emacs
\r
62 SKIP [0] Basic notmuch-hello view in emacs
\r
65 This can lead to situations reminiscent of "dependency hell", so instead
\r
66 of returning based on each individual `test_require_external_prereq's exit
\r
67 status, we now do so only after checking all the prereqs:
\r
70 emacs: Testing emacs interface
\r
71 missing prerequisites: [0] dtach(1) emacs(1) emacsclient(1)
\r
72 skipping test: [0] Basic notmuch-hello view in emacs
\r
73 SKIP [0] Basic notmuch-hello view in emacs
\r
76 Also added missing prereq for dtach(1).
\r
78 test/test-lib.sh | 7 +++++--
\r
79 1 files changed, 5 insertions(+), 2 deletions(-)
\r
81 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
82 index 82767c0..d1fbc05 100644
\r
83 --- a/test/test-lib.sh
\r
84 +++ b/test/test-lib.sh
\r
85 @@ -907,8 +907,11 @@ EOF
\r
88 # test dependencies beforehand to avoid the waiting loop below
\r
89 - test_require_external_prereq emacs || return
\r
90 - test_require_external_prereq emacsclient || return
\r
91 + missing_dependencies=
\r
92 + test_require_external_prereq dtach || missing_dependencies=1
\r
93 + test_require_external_prereq emacs || missing_dependencies=1
\r
94 + test_require_external_prereq emacsclient || missing_dependencies=1
\r
95 + test -z "$missing_dependencies" || return
\r
97 if [ -z "$EMACS_SERVER" ]; then
\r
98 server_name="notmuch-test-suite-$$"
\r