From 2c16c3eec9cb124effa9f8a28da07fecb5523317 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 30 Oct 2015 07:31:14 +2100 Subject: [PATCH] [Frederic Bonnard] Bug#803363: [PATCH] notmuch: workaround for FTBFS --- 6d/b3b8df43cd2455196e4754e3a9cdeb16de3c06 | 218 ++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 6d/b3b8df43cd2455196e4754e3a9cdeb16de3c06 diff --git a/6d/b3b8df43cd2455196e4754e3a9cdeb16de3c06 b/6d/b3b8df43cd2455196e4754e3a9cdeb16de3c06 new file mode 100644 index 000000000..27994f67d --- /dev/null +++ b/6d/b3b8df43cd2455196e4754e3a9cdeb16de3c06 @@ -0,0 +1,218 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 6C86B6DE17F7 + for ; Thu, 29 Oct 2015 04:00:37 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.097 +X-Spam-Level: +X-Spam-Status: No, score=0.097 tagged_above=-999 required=5 tests=[AWL=0.097] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id VW5nSeXgiDIQ for ; + Thu, 29 Oct 2015 04:00:35 -0700 (PDT) +Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 453676DE1804 + for ; Thu, 29 Oct 2015 04:00:34 -0700 (PDT) +Received: from remotemail by gitolite.debian.net with local (Exim 4.80) + (envelope-from ) + id 1ZrkUX-0008IX-Oi; Thu, 29 Oct 2015 10:31:33 +0000 +Received: (nullmailer pid 6016 invoked by uid 1000); Thu, 29 Oct 2015 + 10:31:14 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Frederic Bonnard] Bug#803363: [PATCH] notmuch: workaround for FTBFS +User-Agent: Notmuch/0.21~rc3+7~g10e933a (http://notmuchmail.org) Emacs/24.5.1 + (x86_64-pc-linux-gnu) +Date: Thu, 29 Oct 2015 07:31:14 -0300 +Message-ID: <8737wu6k5p.fsf@zancas.localnet> +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="=-=-=" +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Thu, 29 Oct 2015 11:00:37 -0000 + +--=-=-= +Content-Type: text/plain + + +opinions? Shall I apply this in 0.21? + + + + +--=-=-= +Content-Type: message/rfc822 +Content-Disposition: inline +Content-Transfer-Encoding: 8bit + +Return-path: +Envelope-to: david@tethera.net +Delivery-date: Thu, 29 Oct 2015 06:33:11 -0300 +Received: from quantz.debian.org ([5.153.231.28]) + by yantan.tethera.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) + (Exim 4.80) + (envelope-from ) + id 1Zrja2-0007Yj-SC + for david@tethera.net; Thu, 29 Oct 2015 06:33:11 -0300 +Received: from qa by quantz.debian.org with local (Exim 4.84) + (envelope-from ) + id 1Zrja0-0006wn-Mc + for david@tethera.net; Thu, 29 Oct 2015 09:33:08 +0000 +Received: from buxtehude.debian.org ([140.211.166.26]) from C=NA,ST=NA, + L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=buxtehude.debian.org, + EMAIL=hostmaster@buxtehude.debian.org (verified) by quantz.debian.org with + esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) + (envelope-from ) id 1Zrja0-0006vG-4N for + notmuch@packages.qa.debian.org; Thu, 29 Oct 2015 09:33:08 +0000 +Received: from debbugs by buxtehude.debian.org with local (Exim 4.84) + (envelope-from ) id 1ZrjZy-0004Xs-6i; Thu, + 29 Oct 2015 09:33:06 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#803363: [PATCH] notmuch: workaround for FTBFS +Reply-To: Frederic Bonnard , 803363@bugs.debian.org +Resent-From: Frederic Bonnard +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Carl Worth +X-Loop: owner@bugs.debian.org +Resent-Date: Thu, 29 Oct 2015 09:33:02 +0000 +Resent-Message-ID: +X-Debian-PR-Message: report 803363 +X-Debian-PR-Package: src:notmuch +X-Debian-PR-Keywords: patch +X-Debian-PR-Source: notmuch +Received: via spool by submit@bugs.debian.org id=B.144611105616905 (code + B); Thu, 29 Oct 2015 09:33:02 +0000 +Received: (at submit) by bugs.debian.org; 29 Oct 2015 09:30:56 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02 + (2014-02-07) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-3.9 required=4.0 tests=BAYES_00,MURPHY_DRUGS_REL8, + RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,RP_MATCHES_RCVD,SPF_PASS autolearn=no + autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 34; hammy, 150; neutral, 90; + spammy, 0. spammytokens: hammytokens:0.000-+--Usertags, 0.000-+--ppc64el, + 0.000-+--sourceversion, 0.000-+--source-version, 0.000-+--SourceVersion +Received: from e06smtp05.uk.ibm.com ([195.75.94.101]) by + buxtehude.debian.org with esmtps (TLS1.0:RSA_CAMELLIA_256_CBC_SHA1:256) + (Exim 4.84) (envelope-from ) id 1ZrjXr-0004OF-Up for + submit@bugs.debian.org; Thu, 29 Oct 2015 09:30:56 +0000 +Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP + Gateway: Authorized Use Only! Violators will be prosecuted for + from ; Thu, 29 Oct 2015 + 09:30:47 -0000 +Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by + e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: + Authorized Use Only! Violators will be prosecuted; Thu, 29 Oct 2015 + 09:30:44 -0000 +X-Ibm-Helo: d06dlp01.portsmouth.uk.ibm.com +X-Ibm-Mailfrom: frederic@fr.ibm.com +X-Ibm-Rcptto: submit@bugs.debian.org +Received: from b06cxnps4075.portsmouth.uk.ibm.com + (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by + d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 11C0017D8069 for + ; Thu, 29 Oct 2015 09:30:57 +0000 (GMT) +Received: from d06av11.portsmouth.uk.ibm.com + (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by + b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id + t9T9Uiaf10879262 for ; Thu, 29 Oct 2015 09:30:44 + GMT +Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by + d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP + id t9T9Uif6012102 for ; Thu, 29 Oct 2015 03:30:44 + -0600 +Received: from smtp.lab.toulouse-stg.fr.ibm.com + (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by + d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id + t9T9UiKX012084 for ; Thu, 29 Oct 2015 03:30:44 + -0600 +Received: from debian.fdz.fr (kin.test.toulouse-stg.fr.ibm.com + [9.101.18.11]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id + 0B4A422038C for ; Thu, 29 Oct 2015 10:30:44 +0100 + (CET) +Received: from localhost (localhost [IPv6:::1]) by debian.fdz.fr (Postfix) + with ESMTP id EDEB32AE8C for ; Thu, 29 Oct 2015 + 10:29:59 +0100 (CET) +Date: Thu, 29 Oct 2015 10:29:59 +0100 +Message-ID: <20151029102959.GC32083@kin.test.toulouse-stg.fr.ibm.com> +From: Frederic Bonnard +To: submit@bugs.debian.org +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +Content-Transfer-Encoding: 8bit +X-TM-As-MML: disable +X-Content-Scanned: Fidelis XPS MAILER +X-Cbid: 15102909-0021-0000-0000-000004A37092 +Delivered-To: submit@bugs.debian.org +Delivered-To: notmuch@packages.qa.debian.org +Precedence: list +X-Loop: notmuch@packages.qa.debian.org +X-Debian: PTS +X-Debian-Package: notmuch +X-PTS-Package: notmuch +X-PTS-Keyword: bts +List-ID: +List-Unsubscribe: + +Source: notmuch +Source-Version: 0.21~rc3-3 +Tags: patch +User: debian-powerpc@lists.debian.org +Usertags: ppc64el + +-- + +Hi, +on ppc64el, there is a FTBFS on this version since 0.20.2-2 due a test +failing (070). +This is due to the fact that the test is using a breakpoint on the function +notmuch_database_add_message so that it can force a return code and check +the exit code of the binary is the one injected, but for some reason, gdb +fails to trap that function : the breakpoint does not interrupt the program. +In the early days, this was known because of the ABIv2 that makes a function +have a Local Entry Point and a Global Entry Point. +And gdb placed a breakpoint on notmuch_database_add_message, on the address +off the GEP, and in some case you only get through the LEP, and then +the breakpoint is not called. +For reference : https://sourceware.org/ml/gdb-patches/2014-01/msg01013.html +This should be fixed in gdb now, but it seems there's an issue on that. +So the workaround for the moment is to place a 2nd breakpoint on the LEP, +which is at the address of notmuch_database_add_message + 8. +On other architectures, this won't cause trouble as the first one will be +activated and return with the forced exit code will be done. +So notmuch is not broken, but there is something wrong with gdb, and +in the meantime, I need to check with gdb what's going on. +F. + +--- +Index: sources-notmuch/0.21~rc3-3/test/T070-insert.sh +=================================================================== +--- sources-notmuch/0.21~rc3-3/test/T070-insert.sh ++++ sources-notmuch/0.21~rc3-3/test/T070-insert.sh +@@ -192,8 +192,9 @@ + gen_insert_msg + cat < index-file-$code.gdb + set breakpoint pending on + break notmuch_database_add_message ++break *notmuch_database_add_message+8 + commands + return NOTMUCH_STATUS_$code + continue + end + + +--=-=-=-- -- 2.26.2