[PATCH 1/2] test-lib.sh: renamed die() to die_exit() and added generic die() function

diff --git a/55/bbf9f17547d727aa726e09b8776373d787a04b b/55/bbf9f17547d727aa726e09b8776373d787a04b
new file mode 100644 (file)
index 0000000..696b9cb
--- /dev/null
+++ b/55/bbf9f17547d727aa726e09b8776373d787a04b
@@ -0,0 +1,86 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 6AB7D6DE01C2\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 22:35:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.288\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.288 tagged_above=-999 required=5 tests=[AWL=0.297, \r
+ HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id xfVkQATrxETB for <notmuch@notmuchmail.org>;\r
+ Tue, 12 Apr 2016 22:35:07 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 27AB76DE01F9\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Apr 2016 22:35:06 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 2E3E91001A3; Wed, 13 Apr 2016 08:35:06 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: [PATCH 1/2] test-lib.sh: renamed die() to die_exit() and added\r
+ generic die() function\r
+Date: Wed, 13 Apr 2016 08:35:03 +0300\r
+Message-Id: <1460525704-15145-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.6.4\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 13 Apr 2016 05:35:17 -0000\r
+\r
+The generic die function is now usable in future changes.\r
+---\r
+ test/test-lib.sh | 13 +++++++++++--\r
+ 1 file changed, 11 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index ac04b15a96ba..5620b8cef553 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -229,7 +229,7 @@ _die_common () {\r
+       rm -rf "$TEST_TMPDIR"\r
+ }\r
+ \r
+-die () {\r
++die_exit () {\r
+       _die_common\r
+       if test -n "$GIT_EXIT_OK"\r
+       then\r
+@@ -250,10 +250,19 @@ die_signal () {\r
+       exit $code\r
+ }\r
+ \r
++die () {\r
++      _die_common\r
++      say_color error '%-6s' FATAL\r
++      echo " $*"\r
++      echo\r
++      echo "Unexpected exit while executing $0."\r
++      exit 1\r
++}\r
++\r
+ GIT_EXIT_OK=\r
+ # Note: TEST_TMPDIR *NOT* exported!\r
+ TEST_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/notmuch-test-$$.XXXXXX")\r
+-trap 'die' EXIT\r
++trap 'die_exit' EXIT\r
+ trap 'die_signal' HUP INT TERM\r
+ \r
+ test_decode_color () {\r
+-- \r
+2.6.4\r
+\r