[PATCH 02/17] test: Report test failures from test_expect_*

diff --git a/a1/ca1b0009b166acd083837167b4cb3dd1ba730b b/a1/ca1b0009b166acd083837167b4cb3dd1ba730b
new file mode 100644 (file)
index 0000000..179dad4
--- /dev/null
+++ b/a1/ca1b0009b166acd083837167b4cb3dd1ba730b
@@ -0,0 +1,104 @@
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3ACA6429E2D\r
+       for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:05:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id eSwBKmkFAaHq for <notmuch@notmuchmail.org>;\r
+       Sat, 11 Jun 2011 13:05:19 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+       [18.7.68.35])\r
+       by olra.theworths.org (Postfix) with ESMTP id C15E2429E2A\r
+       for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:05:19 -0700 (PDT)\r
+X-AuditID: 12074423-b7ce8ae000000a29-98-4df3ca7aac5d\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id F8.55.02601.A7AC3FD4; Sat, 11 Jun 2011 16:05:14 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id p5BK5JUf013078; \r
+       Sat, 11 Jun 2011 16:05:19 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id p5BK5Hs8005814\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 11 Jun 2011 16:05:18 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.76)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1QVUQn-0000HW-St; Sat, 11 Jun 2011 16:05:17 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 02/17] test: Report test failures from test_expect_*\r
+Date: Sat, 11 Jun 2011 16:04:28 -0400\r
+Message-Id: <1307822683-848-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.5.1\r
+In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+References: <87ei34rnc5.fsf@yoom.home.cworth.org>\r
+       <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsUixCmqrVt16rOvwdX5KhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxta3i1kK+tgq/izsZ29gfMbSxcjJISFgIjF19iQ2CFtM4sK9\r
+       9UA2F4eQwD5GicNdnSwQzgZGiStnLzFDOPeZJC7/+AyVmc8osf3LK2aQfjYBDYlt+5czgtgi\r
+       AtISO+/OZu1i5OBgFlCT+NOlAhIWFnCRWDbtOlg5i4CqxIkt+9lBbF4BO4mmk3+gzlCQuHJl\r
+       Hth5nAL2EvMOXgWzhQTSJJbc2s0+gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0zvdzM\r
+       Er3UlNJNjKCwYXdR3sH456DSIUYBDkYlHl7FtZ99hVgTy4orcw8xSnIwKYny6pwACvEl5adU\r
+       ZiQWZ8QXleakFh9ilOBgVhLhXd/+yVeINyWxsiq1KB8mJc3BoiTOO1dS3VdIID2xJDU7NbUg\r
+       tQgmK8PBoSTBu/kk0FDBotT01Iq0zJwShDQTByfIcB6g4UdBaniLCxJzizPTIfKnGHU5Hm/Y\r
+       dIhRiCUvPy9VSpz3PkiRAEhRRmke3BxYvL9iFAd6S5j3B0gVDzBVwE16BbSECWiJQCnYkpJE\r
+       hJRUA6PJuqaOHOmeSteffal1pzf+nxwU/vnfj/LPNr0/mi/aHzvt3rFxhfvzK+z6jJqvjZuX\r
+       zqvK7e5I2OjmJ78lpq+4jc9kScKTNIX/T9O4+Nw2JYpuVOeX/n1OO1J19/LbSv8YC7xZt3cd\r
+       Cqs+v+7PGUfn3MLlsabLNfySXBdZ/zr71mr9g1UXMpRYijMSDbWYi4oTARBwSh/SAgAA\r
+Cc: Austin Clements <amdragon@mit.edu>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 11 Jun 2011 20:05:20 -0000\r
+\r
+This makes test_expect_* return non-zero if the test fails, so the\r
+caller can make decisions based on this, such as setting test\r
+prerequisites.\r
+---\r
+ test/test-lib.sh |    2 ++\r
+ 1 files changed, 2 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d0e2794..a122a16 100755\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -581,6 +581,7 @@ test_failure_ () {\r
+       echo "$@" | sed -e 's/^/        /'\r
+       if test "$verbose" != "t"; then cat test.output; fi\r
+       test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; }\r
++      return 1\r
+ }\r
+ \r
+ test_known_broken_ok_ () {\r
+@@ -593,6 +594,7 @@ test_known_broken_failure_ () {\r
+       test_broken=$(($test_broken+1))\r
+       say_color pass "%-6s" "BROKEN"\r
+       echo " $@"\r
++      return 1\r
+ }\r
+ \r
+ test_debug () {\r
+-- \r
+1.7.5.1\r
+\r