[PATCH v2 1/3] test-lib.sh: renamed die...()s to trap...()s and exit...()

diff --git a/eb/221348c3130cc98ffa22404d2b957ad3360660 b/eb/221348c3130cc98ffa22404d2b957ad3360660
new file mode 100644 (file)
index 0000000..6f45fc0
--- /dev/null
+++ b/eb/221348c3130cc98ffa22404d2b957ad3360660
@@ -0,0 +1,103 @@
+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 5B4126DE01EE\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:40:04 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.252\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.252 tagged_above=-999 required=5 tests=[AWL=0.261, \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 GWR6zVFDt4yC for <notmuch@notmuchmail.org>;\r
+ Sat, 28 May 2016 05:39:55 -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 C2CB56DE0127\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:39:54 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 7E4651000B3; Sat, 28 May 2016 15:39:42 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Cc: tomi.ollila@iki.fi\r
+Subject: [PATCH v2 1/3] test-lib.sh: renamed die...()s to trap...()s and\r
+ exit...()\r
+Date: Sat, 28 May 2016 15:39:28 +0300\r
+Message-Id: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.8.2\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: Sat, 28 May 2016 12:40:04 -0000\r
+\r
+Now the function names more accurately describes what the functions do.\r
+---\r
+\r
+V2 of id:1460525704-15145-1-git-send-email-tomi.ollila@iki.fi\r
+\r
+Thanks to David's review this series (or this first patch)\r
+is so much better.\r
+\r
+ test/test-lib.sh | 14 +++++++-------\r
+ 1 file changed, 7 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 201d0ebb94bb..fa9f9beec4f2 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -223,15 +223,15 @@ test_fixed=0\r
+ test_broken=0\r
+ test_success=0\r
+ \r
+-_die_common () {\r
++_exit_common () {\r
+       code=$?\r
+       trap - EXIT\r
+       set +ex\r
+       rm -rf "$TEST_TMPDIR"\r
+ }\r
+ \r
+-die () {\r
+-      _die_common\r
++trap_exit () {\r
++      _exit_common\r
+       if test -n "$GIT_EXIT_OK"\r
+       then\r
+               exit $code\r
+@@ -245,8 +245,8 @@ die () {\r
+       fi\r
+ }\r
+ \r
+-die_signal () {\r
+-      _die_common\r
++trap_signal () {\r
++      _exit_common\r
+       echo >&6 "FATAL: $0: interrupted by signal" $((code - 128))\r
+       exit $code\r
+ }\r
+@@ -254,8 +254,8 @@ die_signal () {\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_signal' HUP INT TERM\r
++trap 'trap_exit' EXIT\r
++trap 'trap_signal' HUP INT TERM\r
+ \r
+ test_decode_color () {\r
+       sed     -e 's/.\[1m/<WHITE>/g' \\r
+-- \r
+2.8.2\r
+\r