fix for Debian build failures

diff --git a/0f/be2293ce6cd361a24def2028b5c1666bc91c68 b/0f/be2293ce6cd361a24def2028b5c1666bc91c68
new file mode 100644 (file)
index 0000000..6b69c02
--- /dev/null
+++ b/0f/be2293ce6cd361a24def2028b5c1666bc91c68
@@ -0,0 +1,115 @@
+Return-Path: <bremner@unb.ca>\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 D05D7431FB6\r
+       for <notmuch@notmuchmail.org>; Mon, 13 Dec 2010 19:06:34 -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 fpIsgGg2wb55 for <notmuch@notmuchmail.org>;\r
+       Mon, 13 Dec 2010 19:06:34 -0800 (PST)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C9027431FB5\r
+       for <notmuch@notmuchmail.org>; Mon, 13 Dec 2010 19:06:33 -0800 (PST)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167185189.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.185.189]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id oBE36XWw014406\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 13 Dec 2010 23:06:33 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.72)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1PSLCG-0004J8-NV; Mon, 13 Dec 2010 23:05:00 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: fix for Debian build failures\r
+User-Agent: Notmuch/0.5-29-gb3caef1 (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 13 Dec 2010 23:05:00 -0400\r
+Message-ID: <87mxo9oy03.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/mixed; boundary="=-=-="\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: Tue, 14 Dec 2010 03:06:34 -0000\r
+\r
+--=-=-=\r
+\r
+resent because of subscription issues.\r
+\r
+I think the following patch might fix the build failures on Debian.  The\r
+idea is to kill the test before the build process kills the whole build.\r
+\r
+Let me know if you'd like me to prepare an upload of 0.5+this-patch.\r
+\r
+\r
+--=-=-=\r
+Content-Type: text/x-diff\r
+Content-Disposition: attachment;\r
+ filename=0001-tests-Add-optional-use-of-timeout-utility-if-present.patch\r
+Content-Description: patch to add timeout to emacs tests\r
+\r
+>From a060745745d82dc9531ed456428420f26ad2833b Mon Sep 17 00:00:00 2001\r
+From: David Bremner <bremner@unb.ca>\r
+Date: Mon, 13 Dec 2010 22:00:47 -0400\r
+Subject: [PATCH] tests: Add optional use of timeout utility, if present. Add to emacs tests.\r
+\r
+The goal here is to treat a hung test as a failure. The emacs test for\r
+sending mail is known to be problematic on the debian\r
+autobuilders. This is both a bandaid fix for that, and a sensible long\r
+term feature.\r
+\r
+Currently a fixed timeout of 5 minutes is used.\r
+---\r
+ test/test-lib.sh |   10 +++++++++-\r
+ 1 files changed, 9 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 418eaa7..639e6ae 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -793,7 +793,7 @@ emacs \$BATCH --no-init-file --no-site-file \\r
+       --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)"\r
+ EOF\r
+       chmod a+x ./run_emacs\r
+-      ./run_emacs "$@"\r
++      $TEST_TIMEOUT_CMD ./run_emacs "$@"\r
+ }\r
+ \r
+ \r
+@@ -986,3 +986,11 @@ test -z "$NO_PYTHON" && test_set_prereq PYTHON\r
+ # test whether the filesystem supports symbolic links\r
+ ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS\r
+ rm -f y\r
++\r
++# test for timeout utility\r
++if command -v timeout >/dev/null; then\r
++    TEST_TIMEOUT_CMD="timeout 5m " \r
++else\r
++    TEST_TIMEOUT_CMD=""\r
++fi\r
++echo $TEST_TIMEOUT_CMD\r
+\ No newline at end of file\r
+-- \r
+1.7.2.3\r
+\r
+\r
+--=-=-=--\r