From 5e2a8222f952f7620185c6e2c1220b5dab509817 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 11 Nov 2013 12:21:21 +2000 Subject: [PATCH] [PATCH 1/2] test: add optional workaround for gmime bug. --- a2/96b91c0c6edcabe29de8cf22cc71a0f2595530 | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 a2/96b91c0c6edcabe29de8cf22cc71a0f2595530 diff --git a/a2/96b91c0c6edcabe29de8cf22cc71a0f2595530 b/a2/96b91c0c6edcabe29de8cf22cc71a0f2595530 new file mode 100644 index 000000000..3907e64c0 --- /dev/null +++ b/a2/96b91c0c6edcabe29de8cf22cc71a0f2595530 @@ -0,0 +1,96 @@ +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 292A2429E31 + for ; Sun, 10 Nov 2013 08:22:14 -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 lLufTO3Q4oc6 for ; + Sun, 10 Nov 2013 08:22:07 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A383D431FDA + for ; Sun, 10 Nov 2013 08:22:07 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1VfXm2-0005po-QA; Sun, 10 Nov 2013 12:22:06 -0400 +Received: (nullmailer pid 15733 invoked by uid 1000); Sun, 10 Nov 2013 + 16:22:02 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] test: add optional workaround for gmime bug. +Date: Sun, 10 Nov 2013 12:21:21 -0400 +Message-Id: <1384100482-15453-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.4.2 +In-Reply-To: <1384100482-15453-1-git-send-email-david@tethera.net> +References: <1384100482-15453-1-git-send-email-david@tethera.net> +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: Sun, 10 Nov 2013 16:22:14 -0000 + +A new variable NOTMUCH_TEST_SLOPPY is introduced, which enables this +workaround. It could be used in the future for similar things. +--- + test/README | 7 +++++++ + test/test-lib.sh | 9 +++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/test/README b/test/README +index d12cff2..eb1a2e6 100644 +--- a/test/README ++++ b/test/README +@@ -96,6 +96,13 @@ Note that some tests in the existing test suite rely on previous test + items, so you cannot arbitrarily skip any test and expect the + remaining tests to be unaffected. + ++Working around some bugs ++------------------------ ++ ++The test suite contains some workarounds for known (minor) problems in ++external dependencies. You can enable these workarounds by setting the ++environment variable NOTMUCH_TEST_SLOPPY to a non-null value. ++ + Writing Tests + ------------- + The test script is written as a shell script. It should start with +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 2aa4dfc..c71bd4e 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -628,6 +628,15 @@ notmuch_json_show_sanitize () + -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' + } + ++notmuch_reply_sanitize () ++{ ++ if test -n "$NOTMUCH_TEST_SLOPPY"; then ++ # work around GMIME bug #711305 ++ sed -e 's/^References: */References: /' ++ else ++ cat ++ fi ++} + # End of notmuch helper functions + + # Use test_set_prereq to tell that a particular prerequisite is available. +-- +1.8.4.2 + -- 2.26.2