1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 029536DE0AC2
\r
6 for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:25:17 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.656 tagged_above=-999 required=5 tests=[AWL=0.004,
\r
12 SPF_NEUTRAL=0.652] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id mR41UZaKUkFa for <notmuch@notmuchmail.org>;
\r
16 Sun, 24 Jan 2016 07:25:14 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by arlo.cworth.org (Postfix) with ESMTP id E4F9F6DE0217
\r
19 for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:25:13 -0800 (PST)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 134471000B3;
\r
22 Sun, 24 Jan 2016 17:25:26 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
\r
25 Notmuch Mail <notmuch@notmuchmail.org>
\r
26 Subject: Re: [PATCH v2 06/16] Prefer gpg2 in the test suite if available
\r
27 In-Reply-To: <1453258369-7366-7-git-send-email-dkg@fifthhorseman.net>
\r
28 References: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>
\r
29 <1453258369-7366-7-git-send-email-dkg@fifthhorseman.net>
\r
30 User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1
\r
31 (x86_64-unknown-linux-gnu)
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Sun, 24 Jan 2016 17:25:26 +0200
\r
36 Message-ID: <m2r3h757a1.fsf@guru.guru-group.fi>
\r
38 Content-Type: text/plain
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.20
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Sun, 24 Jan 2016 15:25:17 -0000
\r
53 On Wed, Jan 20 2016, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:
\r
55 > Now that the notmuch client prefers gpg2 if available, having the test
\r
56 > suite use the same preference makes it more likely to validate as
\r
59 > Be warned that the final test in T350-crypto.sh fails with an infinite
\r
60 > loop in gpg if you're using an unpatched GnuPG 2.1.10, due to an
\r
61 > upstream GnuPG bug: https://bugs.gnupg.org/gnupg/issue2187. In
\r
62 > debian, this is resolved in 2.1.10-3
\r
64 > test/README | 2 +-
\r
65 > test/T030-config.sh | 2 +-
\r
66 > test/T040-setup.sh | 2 +-
\r
67 > test/T350-crypto.sh | 16 ++++++++--------
\r
68 > test/test-lib.sh | 10 +++++++++-
\r
69 > 5 files changed, 20 insertions(+), 12 deletions(-)
\r
71 > --- a/test/test-lib.sh
\r
72 > +++ b/test/test-lib.sh
\r
73 > @@ -85,6 +85,13 @@ unset GREP_OPTIONS
\r
75 > unset ALTERNATE_EDITOR
\r
77 > +# choose the preferred GnuPG binary:
\r
78 > +if hash gpg2 2> /dev/null; then
\r
80 For consistency, instead of hash ... 2>/dev/null, use command -v >/dev/null
\r
91 > # A regexp to match 5 and 40 hexdigits
\r
92 > @@ -1139,6 +1146,7 @@ test_emacs () {
\r
93 > $load_emacs_tests \
\r
94 > --eval '(setq server-name \"$server_name\")' \
\r
95 > --eval '(server-start)' \
\r
96 > + --eval '(setq epg-gpg-program \"$GPG\")' \
\r
97 > --eval '(orphan-watchdog $$)'" || return
\r
98 > EMACS_SERVER="$server_name"
\r
99 > # wait until the emacs server is up
\r
100 > @@ -1327,5 +1335,5 @@ test_declare_external_prereq dtach
\r
101 > test_declare_external_prereq emacs
\r
102 > test_declare_external_prereq ${TEST_EMACSCLIENT}
\r
103 > test_declare_external_prereq gdb
\r
104 > -test_declare_external_prereq gpg
\r
105 > +test_declare_external_prereq gpg2 || test_declare_external_prereq gpg
\r
106 > test_declare_external_prereq ${NOTMUCH_PYTHON}
\r