--- /dev/null
+Return-Path: <dme@dme.org>\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 7FE62431FCB\r
+ for <notmuch@notmuchmail.org>; Mon, 16 Jan 2012 08:47:44 -0800 (PST)\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 2k9FKu2IEPkm for <notmuch@notmuchmail.org>;\r
+ Mon, 16 Jan 2012 08:47:40 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ B3009431FAE for <notmuch@notmuchmail.org>; Mon, 16 Jan 2012 08:47:38 -0800\r
+ (PST)\r
+Received: by mail-ww0-f45.google.com with SMTP id dr13so398317wgb.2\r
+ for <notmuch@notmuchmail.org>; Mon, 16 Jan 2012 08:47:38 -0800 (PST)\r
+Received: by 10.180.14.72 with SMTP id n8mr21365246wic.22.1326732458400;\r
+ Mon, 16 Jan 2012 08:47:38 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+ (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+ by mx.google.com with ESMTPS id di5sm35021507wib.3.2012.01.16.08.47.36\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 16 Jan 2012 08:47:37 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+ id 5ECF2A0397; Mon, 16 Jan 2012 16:47:35 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] test: Add "test_expect_emacs_t" to assist with emacs\r
+ testing.\r
+Date: Mon, 16 Jan 2012 16:47:32 +0000\r
+Message-Id: <1326732453-23377-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.7.3\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: Mon, 16 Jan 2012 16:47:44 -0000\r
+\r
+"test_expect_emacs_t" expects a single argument. If this is `t' then\r
+the test passes. Otherwise the argument provides the details of the\r
+test failure to be reported.\r
+---\r
+\r
+For use in the following set of tests and later for other emacs related tests.\r
+\r
+ test/test-lib.sh | 20 ++++++++++++++++++++\r
+ 1 files changed, 20 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d1fbc05..0ffe9a6 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -503,6 +503,26 @@ test_expect_equal_file ()\r
+ fi\r
+ }\r
+ \r
++# Pass test if the result is `t', else report the results.\r
++test_expect_emacs_t ()\r
++{\r
++ exec 1>&6 2>&7 # Restore stdout and stderr\r
++ inside_subtest=\r
++ test "$#" = 1 ||\r
++ error "bug in the test script: not 1 parameter to test_expect_emacs_t"\r
++\r
++ result="$1"\r
++ if ! test_skip "$test_subtest_name"\r
++ then\r
++ if [ "${result}" == "t" ] ; then\r
++ test_ok_ "$test_subtest_name"\r
++ else\r
++ testname=$this_test.$test_count\r
++ test_failure_ "$test_subtest_name" "$(eval printf ${result})"\r
++ fi\r
++ fi\r
++}\r
++\r
+ NOTMUCH_NEW ()\r
+ {\r
+ notmuch new | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file'\r
+-- \r
+1.7.7.3\r
+\r