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