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 olra.theworths.org (Postfix) with ESMTP id DA382431FB6
\r
6 for <notmuch@notmuchmail.org>; Sun, 20 Jan 2013 19:02:02 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 r7tV0NygbKtJ for <notmuch@notmuchmail.org>;
\r
16 Sun, 20 Jan 2013 19:02:02 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id DA53F431FBD
\r
19 for <notmuch@notmuchmail.org>; Sun, 20 Jan 2013 19:02:01 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 361B81000CF; Mon, 21 Jan 2013 05:01:51 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH 2/2] test/test-lib.sh: separate signaled exit
\r
25 Date: Mon, 21 Jan 2013 05:01:46 +0200
\r
26 Message-Id: <1358737306-21744-2-git-send-email-tomi.ollila@iki.fi>
\r
27 X-Mailer: git-send-email 1.8.0
\r
28 In-Reply-To: <1358737306-21744-1-git-send-email-tomi.ollila@iki.fi>
\r
29 References: <id:1358717493-11231-1-git-send-email-tomi.ollila@iki.fi>
\r
30 <1358737306-21744-1-git-send-email-tomi.ollila@iki.fi>
\r
31 Cc: tomi.ollila@iki.fi
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Mon, 21 Jan 2013 03:02:03 -0000
\r
46 When execution of tests is interrupted by signal coming outside of the
\r
47 test system itself, output just one line "interrupted by signal <num>"
\r
48 message to standard output. This distinguishes the case from internal
\r
49 exit and reduces noise.
\r
51 test/test-lib.sh | 15 ++++++++++++++-
\r
52 1 file changed, 14 insertions(+), 1 deletion(-)
\r
54 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
55 index 0098bfd..e717c52 100644
\r
56 --- a/test/test-lib.sh
\r
57 +++ b/test/test-lib.sh
\r
58 @@ -190,9 +190,15 @@ test_fixed=0
\r
67 rm -rf "$TEST_TMPDIR"
\r
72 if test -n "$GIT_EXIT_OK"
\r
75 @@ -206,10 +212,17 @@ die () {
\r
81 + echo >&5 "FATAL: $0: interrupted by signal" $((code - 128))
\r
86 # Note: TEST_TMPDIR *NOT* exported!
\r
87 TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")
\r
89 +trap 'die_signal' HUP INT TERM
\r
91 test_decode_color () {
\r
92 sed -e 's/.\[1m/<WHITE>/g' \
\r