--- /dev/null
+Return-Path: <bremner@tethera.net>\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 6DDB96DE02C3\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:37:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.012\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5\r
+ tests=[AWL=-0.001, SPF_PASS=-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 oH5r876GZJd7 for <notmuch@notmuchmail.org>;\r
+ Sat, 4 Jun 2016 05:37:34 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A2A2F6DE02C2\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Jun 2016 05:37:34 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1b9ApN-00056b-Ml; Sat, 04 Jun 2016 08:37:21 -0400\r
+Received: (nullmailer pid 15548 invoked by uid 1000);\r
+ Sat, 04 Jun 2016 12:37:31 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, Istvan Marko <notmuch@kismala.com>,\r
+ Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: [PATCH] fixup! test: factor out some boilerplate from C tests\r
+Date: Sat, 4 Jun 2016 09:37:26 -0300\r
+Message-Id: <1465043846-15506-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1465043356-23420-3-git-send-email-david@tethera.net>\r
+References: <1465043356-23420-3-git-send-email-david@tethera.net>\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, 04 Jun 2016 12:37:42 -0000\r
+\r
+---\r
+ test/notmuch-test.h | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/notmuch-test.h b/test/notmuch-test.h\r
+index e6e1d6c..d39febb 100644\r
+--- a/test/notmuch-test.h\r
++++ b/test/notmuch-test.h\r
+@@ -3,7 +3,8 @@\r
+ #include <stdio.h>\r
+ #include <notmuch.h>\r
+ \r
+-void expect0(int line, notmuch_status_t ret)\r
++inline static void\r
++expect0(int line, notmuch_status_t ret)\r
+ {\r
+ if (ret) {\r
+ fprintf (stderr, "line %d: %s\n", line, ret);\r
+-- \r
+2.8.1\r
+\r