[PATCH v2 2/3] test: add function die () and have use of it in add_email_corpus ()

diff --git a/dd/820234b8187e6d53874bda938407b644075690 b/dd/820234b8187e6d53874bda938407b644075690
new file mode 100644 (file)
index 0000000..83c0d26
--- /dev/null
+++ b/dd/820234b8187e6d53874bda938407b644075690
@@ -0,0 +1,89 @@
+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 278D76DE0217\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 0-QMQa-KN3u1 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 9D1506DE01EE\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2016 05:39:55 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 825281000C6; Sat, 28 May 2016 15:39:43 +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 2/3] test: add function die () and have use of it in\r
+ add_email_corpus ()\r
+Date: Sat, 28 May 2016 15:39:29 +0300\r
+Message-Id: <1464439170-25978-2-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.8.2\r
+In-Reply-To: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1464439170-25978-1-git-send-email-tomi.ollila@iki.fi>\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
+Added die() function to test-lib.sh with the following first use of it:\r
+\r
+If notmuch new fails during email corpus addition the database is\r
+most probably inexistent or broken and the added corpus would be\r
+unusable while running single tests, giving misleading failures\r
+("only" full 'make test' cleans out old corpus).\r
+---\r
+ test/test-lib.sh | 12 +++++++++++-\r
+ 1 file changed, 11 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index fa9f9beec4f2..ce3780a0426d 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -251,6 +251,16 @@ trap_signal () {\r
+       exit $code\r
+ }\r
+ \r
++die () {\r
++      _exit_common\r
++      exec >&6\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
+@@ -544,7 +554,7 @@ add_email_corpus ()\r
+       cp -a $TEST_DIRECTORY/corpus.mail ${MAIL_DIR}\r
+     else\r
+       cp -a $TEST_DIRECTORY/corpus ${MAIL_DIR}\r
+-      notmuch new >/dev/null\r
++      notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus"\r
+       cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail\r
+     fi\r
+ }\r
+-- \r
+2.8.2\r
+\r