Here is a timeout patch that actually seems to work. Also attached are
the diffs to debian/changelog to update to 0.5+nmu2.
>From f8e8ea0058ca2e57fececc3f01cc05ece0c3c3c8 Mon Sep 17 00:00:00 2001
From: David Bremner <brem...@unb.ca>
Date: Sun, 19 Dec 2010 21:48:59 -0400
Subject: [PATCH 1/2] tests: Add optional use of timeout utility, if present. Each top level
test (basic, corpus, etc...) is run with a fixed timeout of 10m.
The goal here is to treat a hung test as a failure. The emacs test
for sending mail is known to be problematic on the debian
autobuilders. This is both a bandaid fix for that, and a sensible
long term feature.
---
test/notmuch-test | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/test/notmuch-test b/test/notmuch-test
index b51045a..b75bc40 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -21,9 +21,17 @@ TESTS="basic new search json thread-naming raw reply dump-restore uuencode threa
# Clean up any results from a previous run
rm -r test-results >/dev/null 2>/dev/null
+# test for timeout utility
+if command -v timeout >/dev/null; then
+ TEST_TIMEOUT_CMD="timeout 10m "
+ echo "INFO: using 10 minute timeout for tests"
+else
+ TEST_TIMEOUT_CMD=""
+fi
+
# Run the tests
for test in $TESTS; do
- ./$test "$@"
+ $TEST_TIMEOUT_CMD ./$test "$@"
done
# Report results
--
1.7.2.3
>From 6998bffbaf2b4d683b8ce0b1706b3636d60a6559 Mon Sep 17 00:00:00 2001
From: David Bremner <brem...@unb.ca>
Date: Tue, 14 Dec 2010 22:24:38 -0400
Subject: [PATCH 2/2] Add NMU stanzas to changelog
---
debian/changelog | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc758b9..790f34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+notmuch (0.5+nmu2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Second try at timeout for test. Put timeouts at top level.
+
+ -- David Bremner <brem...@debian.org> Sun, 19 Dec 2010 21:40:08 -0400
+
+notmuch (0.5+nmu1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Add a timeout to emacs tests to hopefully work around build failures.
+
+ -- David Bremner <brem...@debian.org> Tue, 14 Dec 2010 22:23:51 -0400
+
notmuch (0.5) unstable; urgency=low
* new: maildir-flag synchronization
--
1.7.2.3
