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 8E174431FB6 for ; Wed, 27 Nov 2013 23:36:15 -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 4R5SadTdVXEs for ; Wed, 27 Nov 2013 23:36:09 -0800 (PST) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 800A1431FAE for ; Wed, 27 Nov 2013 23:36:09 -0800 (PST) Received: from guru.guru-group.fi (localhost [IPv6:::1]) by guru.guru-group.fi (Postfix) with ESMTP id 9FE3B10005E; Thu, 28 Nov 2013 09:36:01 +0200 (EET) From: Tomi Ollila To: David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] test/crypto: disable gpg version printing In-Reply-To: <1385566546-18857-1-git-send-email-david@tethera.net> References: <1385566546-18857-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; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Thu, 28 Nov 2013 07:36:15 -0000 On Wed, Nov 27 2013, David Bremner wrote: > This was causing test failures because version strings varied in > length between GNU/Linux and GNU/KFreeBSD. One can also imagine > different versions of gnupg causing the same failure. > --- > Thanks to dkg for the hints to find this bug. W=C3=B6rks. +1 Tomi > > test/crypto | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/test/crypto b/test/crypto > index aa96ec2..9e5ff4f 100755 > --- a/test/crypto > +++ b/test/crypto > @@ -19,6 +19,7 @@ add_gnupg_home () > elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then > echo debug-quick-random >> "$GNUPGHOME"/gpg.conf > fi > + echo no-emit-version >> "$GNUPGHOME"/gpg.conf > } >=20=20 > ################################################## > @@ -62,7 +63,7 @@ expected=3D'[[[{"id": "XXXXX", > "content": "This is a test signed message.\n"}, > {"id": 3, > "content-type": "application/pgp-signature", > - "content-length": 315}]}]}, > + "content-length": 280}]}]}, > []]]]' > test_expect_equal_json \ > "$output" \ > @@ -97,7 +98,7 @@ expected=3D'[[[{"id": "XXXXX", > "content": "This is a test signed message.\n"}, > {"id": 3, > "content-type": "application/pgp-signature", > - "content-length": 315}]}]}, > + "content-length": 280}]}]}, > []]]]' > test_expect_equal_json \ > "$output" \ > @@ -130,7 +131,7 @@ expected=3D'[[[{"id": "XXXXX", > "content": "This is a test signed message.\n"}, > {"id": 3, > "content-type": "application/pgp-signature", > - "content-length": 315}]}]}, > + "content-length": 280}]}]}, > []]]]' > test_expect_equal_json \ > "$output" \ > @@ -354,7 +355,7 @@ expected=3D'[[[{"id": "XXXXX", > "content": "This is a test signed message.\n"}, > {"id": 3, > "content-type": "application/pgp-signature", > - "content-length": 315}]}]}, > + "content-length": 280}]}]}, > []]]]' > test_expect_equal_json \ > "$output" \ > --=20 > 1.8.4.3 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch