From: Tomi Ollila Date: Mon, 18 Nov 2013 17:54:52 +0000 (+0200) Subject: Re: fix for failing tests with gmime 2.6.19 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92e67dec5ec704b52b56f998f0c468a9437d562d;p=notmuch-archives.git Re: fix for failing tests with gmime 2.6.19 --- diff --git a/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b b/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b new file mode 100644 index 000000000..38a55563e --- /dev/null +++ b/9c/ba3be06dd8e0a939ce86b0b33689ebcdb8023b @@ -0,0 +1,101 @@ +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 1702D431FD5 + for ; Mon, 18 Nov 2013 09:55:10 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 dyd+18EBFJLK for ; + Mon, 18 Nov 2013 09:55:02 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id A61C3431FC7 + for ; Mon, 18 Nov 2013 09:55:02 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 23D85100030; + Mon, 18 Nov 2013 19:54:53 +0200 (EET) +From: Tomi Ollila +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: fix for failing tests with gmime 2.6.19 +In-Reply-To: <1384100482-15453-1-git-send-email-david@tethera.net> +References: <1384100482-15453-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Mon, 18 Nov 2013 17:55:10 -0000 + +On Sun, Nov 10 2013, David Bremner wrote: + +> Although Jeffrey Stedfast fixed gmime bug 711305 amazingly quickly, it +> looks like many people still have to live with a buggy version of +> gmime for a while yet. Here is an opt-in fix that stops the test suite +> from failing; this is a simple fix for e.g. the debian build process. + +After looking throught all the comments and thinking about the options +I see the following 2 options + +1) Keep things as those currently are. Anyone who runs tests when + gmime 2.6.19 is in use will see some tests fail (and some may not have + a clue what's going on). We could mention this first thing in the NEWS + so that the "professional" users who run test *and* reads NEWS will + get the clue. + +2) Push the current patches to release branch *only* (maybe the test + could be changed to if [ pkg-config --exact-version=2.6.19 gmime-2.6 ] (*) + instead of checking the WORKAROUNDS flag so that users would not have + to bother (and some may not have a clue what's going on)). During merge + to master (as it has been done in the past) these changes would probably + be dropped. + +2b) Merge to master, release 0.17, follow gmime deployments, revert + patches. + + +IMHO for temporary problems there could be temporary cruft (which would +not be cruft if the problem wasn't temporary). The test system must +be as strict as it can be to ensure best failure coverage. + +Tomi + + +(*) The fastest (& most cruftiest) implementation: + +notmuch_reply_sanitize () +{ + if pkg-config --exact-version=2.6.19 gmime-2.6 >/dev/null + then + notmuch_reply_sanitize () { + # work around GMIME bug #711305 + sed -e 's/^References: /References: /' + } + else + notmuch_reply_sanitize () { + cat + } + fi + notmuch_reply_sanitize # call just rewritten version of this function +}