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 5B4126DE01EE
\r
6 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:40:04 -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 GWR6zVFDt4yC for <notmuch@notmuchmail.org>;
\r
17 Sat, 28 May 2016 05:39:55 -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 C2CB56DE0127
\r
20 for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:39:54 -0700 (PDT)
\r
21 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
22 id 7E4651000B3; Sat, 28 May 2016 15:39:42 +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 1/3] test-lib.sh: renamed die...()s to trap...()s and
\r
28 Date: Sat, 28 May 2016 15:39:28 +0300
\r
29 Message-Id: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>
\r
30 X-Mailer: git-send-email 2.8.2
\r
31 X-BeenThere: notmuch@notmuchmail.org
\r
32 X-Mailman-Version: 2.1.20
\r
34 List-Id: "Use and development of the notmuch mail system."
\r
35 <notmuch.notmuchmail.org>
\r
36 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
37 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
38 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
39 List-Post: <mailto:notmuch@notmuchmail.org>
\r
40 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
41 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
43 X-List-Received-Date: Sat, 28 May 2016 12:40:04 -0000
\r
45 Now the function names more accurately describes what the functions do.
\r
48 V2 of id:1460525704-15145-1-git-send-email-tomi.ollila@iki.fi
\r
50 Thanks to David's review this series (or this first patch)
\r
53 test/test-lib.sh | 14 +++++++-------
\r
54 1 file changed, 7 insertions(+), 7 deletions(-)
\r
56 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
57 index 201d0ebb94bb..fa9f9beec4f2 100644
\r
58 --- a/test/test-lib.sh
\r
59 +++ b/test/test-lib.sh
\r
60 @@ -223,15 +223,15 @@ test_fixed=0
\r
69 rm -rf "$TEST_TMPDIR"
\r
76 if test -n "$GIT_EXIT_OK"
\r
79 @@ -245,8 +245,8 @@ die () {
\r
87 echo >&6 "FATAL: $0: interrupted by signal" $((code - 128))
\r
90 @@ -254,8 +254,8 @@ die_signal () {
\r
92 # Note: TEST_TMPDIR *NOT* exported!
\r
93 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
\r
95 -trap 'die_signal' HUP INT TERM
\r
96 +trap 'trap_exit' EXIT
\r
97 +trap 'trap_signal' HUP INT TERM
\r
99 test_decode_color () {
\r
100 sed -e 's/.\[1m/<WHITE>/g' \
\r