From: Glenn Morris <rgm@gnu.org>
Date: Sat, 15 Dec 2018 01:09:02 +0000 (-0500)
Subject: An epg test failure with recent GnuPG versions has been fixed
X-Git-Tag: archive/raspbian/1%26.1+1-3+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e399e9c288bcd71cb2b7f9388a187c8c303548f9;p=emacs.git

An epg test failure with recent GnuPG versions has been fixed

This patch has been backported from upstream to fix m68k build
failures:

  Fix an epg test for recent GnuPG versions (bug#33439)

  * test/lisp/epg-tests.el (epg-decrypt-1):
  Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.

Origin: backport, commit: fa953b58afd39d396dab4d76a6ff0b8ba4040eb8)
Bug: https://debbugs.gnu.org/33439
Forwarded: not-needed

Gbp-Pq: Name 0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
---

diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index 0fe15017dd0..f2cc351d70b 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -87,6 +87,8 @@
 (ert-deftest epg-decrypt-1 ()
   (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
   (with-epg-tests (:require-passphrase t)
+    (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
+      (insert "ignore-mdc-error"))
     (should (equal "test"
 		   (epg-decrypt-string epg-tests-context "\
 -----BEGIN PGP MESSAGE-----