--- /dev/null
+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 6779E431FD0\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Dec 2010 19:52:23 -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 GEeMhKejEbio for <notmuch@notmuchmail.org>;\r
+ Mon, 20 Dec 2010 19:52:22 -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 83022431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Dec 2010 19:52:22 -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 oBL3qCDs030839\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+ Mon, 20 Dec 2010 23:52:13 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.72)\r
+ (envelope-from <bremner@unb.ca>)\r
+ id 1PUtFU-0001VZ-Ig; Mon, 20 Dec 2010 23:50:52 -0400\r
+From: David Bremner <bremner@debian.org>\r
+To: 603308@bugs.debian.org\r
+Subject: better timeout patch.\r
+User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1\r
+ (x86_64-pc-linux-gnu)\r
+Message-ID: <87fwtreqcj.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/mixed; boundary="=-=-="\r
+X-Mailman-Approved-At: Tue, 11 Jan 2011 13:38:14 -0800\r
+Cc: notmuch@notmuchmail.org\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
+Date: Tue, 21 Dec 2010 03:52:23 -0000\r
+X-Original-Date: Mon, 20 Dec 2010 23:50:52 -0400\r
+X-List-Received-Date: Tue, 21 Dec 2010 03:52:23 -0000\r
+\r
+--=-=-=\r
+\r
+\r
+Here is a timeout patch that actually seems to work. Also attached are\r
+the diffs to debian/changelog to update to 0.5+nmu2.\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: add timeout to test.\r
+\r
+>From f8e8ea0058ca2e57fececc3f01cc05ece0c3c3c8 Mon Sep 17 00:00:00 2001\r
+From: David Bremner <bremner@unb.ca>\r
+Date: Sun, 19 Dec 2010 21:48:59 -0400\r
+Subject: [PATCH 1/2] tests: Add optional use of timeout utility, if present. Each top level\r
+ test (basic, corpus, etc...) is run with a fixed timeout of 10m.\r
+\r
+ The goal here is to treat a hung test as a failure. The emacs test\r
+ for sending mail is known to be problematic on the debian\r
+ autobuilders. This is both a bandaid fix for that, and a sensible\r
+ long term feature.\r
+---\r
+ test/notmuch-test | 10 +++++++++-\r
+ 1 files changed, 9 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/notmuch-test b/test/notmuch-test\r
+index b51045a..b75bc40 100755\r
+--- a/test/notmuch-test\r
++++ b/test/notmuch-test\r
+@@ -21,9 +21,17 @@ TESTS="basic new search json thread-naming raw reply dump-restore uuencode threa\r
+ # Clean up any results from a previous run\r
+ rm -r test-results >/dev/null 2>/dev/null\r
+ \r
++# test for timeout utility\r
++if command -v timeout >/dev/null; then\r
++ TEST_TIMEOUT_CMD="timeout 10m "\r
++ echo "INFO: using 10 minute timeout for tests"\r
++else\r
++ TEST_TIMEOUT_CMD=""\r
++fi\r
++\r
+ # Run the tests\r
+ for test in $TESTS; do\r
+- ./$test "$@"\r
++ $TEST_TIMEOUT_CMD ./$test "$@"\r
+ done\r
+ \r
+ # Report results\r
+-- \r
+1.7.2.3\r
+\r
+\r
+--=-=-=\r
+Content-Type: text/x-diff\r
+Content-Disposition: attachment;\r
+ filename=0002-Add-NMU-stanzas-to-changelog.patch\r
+Content-Description: changelog diff\r
+\r
+>From 6998bffbaf2b4d683b8ce0b1706b3636d60a6559 Mon Sep 17 00:00:00 2001\r
+From: David Bremner <bremner@unb.ca>\r
+Date: Tue, 14 Dec 2010 22:24:38 -0400\r
+Subject: [PATCH 2/2] Add NMU stanzas to changelog\r
+\r
+---\r
+ debian/changelog | 14 ++++++++++++++\r
+ 1 files changed, 14 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/debian/changelog b/debian/changelog\r
+index cc758b9..790f34b 100644\r
+--- a/debian/changelog\r
++++ b/debian/changelog\r
+@@ -1,3 +1,17 @@\r
++notmuch (0.5+nmu2) experimental; urgency=low\r
++\r
++ * Non-maintainer upload.\r
++ * Second try at timeout for test. Put timeouts at top level.\r
++\r
++ -- David Bremner <bremner@debian.org> Sun, 19 Dec 2010 21:40:08 -0400\r
++\r
++notmuch (0.5+nmu1) experimental; urgency=low\r
++\r
++ * Non-maintainer upload.\r
++ * Add a timeout to emacs tests to hopefully work around build failures.\r
++\r
++ -- David Bremner <bremner@debian.org> Tue, 14 Dec 2010 22:23:51 -0400\r
++\r
+ notmuch (0.5) unstable; urgency=low\r
+ \r
+ * new: maildir-flag synchronization\r
+-- \r
+1.7.2.3\r
+\r
+\r
+--=-=-=--\r
projects / notmuch-archives.git / commitdiff