1 Return-Path: <too@guru-group.fi>
\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 arlo.cworth.org (Postfix) with ESMTP id BDAC06DE02C3
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:40:11 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.252 tagged_above=-999 required=5 tests=[AWL=0.261,
\r
12 HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]
\r
14 Received: from arlo.cworth.org ([127.0.0.1])
\r
15 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 0ND5zwtGLSoB for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2016 05:40:04 -0700 (PDT)
\r
18 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
19 by arlo.cworth.org (Postfix) with ESMTP id 3F5806DE01F7
\r
20 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:39:56 -0700 (PDT)
\r
21 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
22 id 1F10A1000B3; Sat, 28 May 2016 15:39:44 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: notmuch@notmuchmail.org
\r
25 Cc: tomi.ollila@iki.fi
\r
26 Subject: [PATCH v2 3/3] test: fix die() in test-lib-common.sh
\r
27 Date: Sat, 28 May 2016 15:39:30 +0300
\r
28 Message-Id: <1464439170-25978-3-git-send-email-tomi.ollila@iki.fi>
\r
29 X-Mailer: git-send-email 2.8.2
\r
30 In-Reply-To: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>
\r
31 References: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.20
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Sat, 28 May 2016 12:40:11 -0000
\r
46 In scripts that include test-lib-common.sh but not test-lib.sh
\r
47 the die() implementation needs to be a bit different due to
\r
48 fd redirection differences. test-lib-common.sh implements die()
\r
49 only if it was not implemented already.
\r
51 test/test-lib-common.sh | 6 ++++++
\r
52 1 file changed, 6 insertions(+)
\r
54 diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
\r
55 index ba4a8e112084..bc2322162fd5 100644
\r
56 --- a/test/test-lib-common.sh
\r
57 +++ b/test/test-lib-common.sh
\r
59 # This file contains common code to be used by both the regular
\r
60 # (correctness) tests and the performance tests.
\r
62 +# test-lib.sh defines die() which echoes to nonstandard fd where
\r
63 +# output was redirected earlier in that file. If test-lib.sh is not
\r
64 +# loaded, neither this redirection nor die() function were defined.
\r
66 +type die >/dev/null 2>&1 || die () { echo "$@" >&2; exit 1; }
\r
68 find_notmuch_path ()
\r