Re: [PATCH v2 06/16] Prefer gpg2 in the test suite if available

diff --git a/f7/cf75a00410c57b45c336f0984af6b306b366d9 b/f7/cf75a00410c57b45c336f0984af6b306b366d9
new file mode 100644 (file)
index 0000000..a967df4
--- /dev/null
+++ b/f7/cf75a00410c57b45c336f0984af6b306b366d9
@@ -0,0 +1,108 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 029536DE0AC2\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:25:17 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.656\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.656 tagged_above=-999 required=5 tests=[AWL=0.004, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id mR41UZaKUkFa for <notmuch@notmuchmail.org>;\r
+ Sun, 24 Jan 2016 07:25:14 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E4F9F6DE0217\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:25:13 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 134471000B3;\r
+ Sun, 24 Jan 2016 17:25:26 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v2 06/16] Prefer gpg2 in the test suite if available\r
+In-Reply-To: <1453258369-7366-7-git-send-email-dkg@fifthhorseman.net>\r
+References: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1453258369-7366-7-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 24 Jan 2016 17:25:26 +0200\r
+Message-ID: <m2r3h757a1.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 24 Jan 2016 15:25:17 -0000\r
+\r
+On Wed, Jan 20 2016, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:\r
+\r
+> Now that the notmuch client prefers gpg2 if available, having the test\r
+> suite use the same preference makes it more likely to validate as\r
+> expected.\r
+>\r
+> Be warned that the final test in T350-crypto.sh fails with an infinite\r
+> loop in gpg if you're using an unpatched GnuPG 2.1.10, due to an\r
+> upstream GnuPG bug: https://bugs.gnupg.org/gnupg/issue2187.  In\r
+> debian, this is resolved in 2.1.10-3\r
+> ---\r
+>  test/README         |  2 +-\r
+>  test/T030-config.sh |  2 +-\r
+>  test/T040-setup.sh  |  2 +-\r
+>  test/T350-crypto.sh | 16 ++++++++--------\r
+>  test/test-lib.sh    | 10 +++++++++-\r
+>  5 files changed, 20 insertions(+), 12 deletions(-)\r
+>\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -85,6 +85,13 @@ unset GREP_OPTIONS\r
+>  # For emacsclient\r
+>  unset ALTERNATE_EDITOR\r
+>  \r
+> +# choose the preferred GnuPG binary:\r
+> +if hash gpg2 2> /dev/null; then\r
+\r
+For consistency, instead of hash ... 2>/dev/null, use command -v >/dev/null\r
+\r
+Tomi\r
+\r
+> +    GPG=gpg2\r
+> +else\r
+> +    GPG=gpg\r
+> +fi\r
+> +\r
+>  # Convenience\r
+>  #\r
+>  # A regexp to match 5 and 40 hexdigits\r
+> @@ -1139,6 +1146,7 @@ test_emacs () {\r
+>                              $load_emacs_tests \\r
+>                              --eval '(setq server-name \"$server_name\")' \\r
+>                              --eval '(server-start)' \\r
+> +                            --eval '(setq epg-gpg-program \"$GPG\")' \\r
+>                              --eval '(orphan-watchdog $$)'" || return\r
+>              EMACS_SERVER="$server_name"\r
+>              # wait until the emacs server is up\r
+> @@ -1327,5 +1335,5 @@ test_declare_external_prereq dtach\r
+>  test_declare_external_prereq emacs\r
+>  test_declare_external_prereq ${TEST_EMACSCLIENT}\r
+>  test_declare_external_prereq gdb\r
+> -test_declare_external_prereq gpg\r
+> +test_declare_external_prereq gpg2 || test_declare_external_prereq gpg\r
+>  test_declare_external_prereq ${NOTMUCH_PYTHON}\r
+> -- \r
+> 2.7.0.rc3\r