From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 25 Dec 2020 19:56:22 +0000 (+0100)
Subject: Fix gpg-agent killing in mml-sec-tests
X-Git-Tag: emacs-28.0.90~4563
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00b8fdf29b83092a830f85e73084382c3a166ed3;p=emacs.git

Fix gpg-agent killing in mml-sec-tests

* test/lisp/gnus/mml-sec-tests.el (mml-sec-test--kill-gpg-agent):
Identify the gpg-agent more successfully after the resource dir
makeover.
---

diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
index a6002b4d51e..20d8e03c385 100644
--- a/test/lisp/gnus/mml-sec-tests.el
+++ b/test/lisp/gnus/mml-sec-tests.el
@@ -883,7 +883,8 @@ So the second decryption fails."
                  (equal (cdr (assq 'comm atts)) "gpg-agent")
                  (string-match
                   (concat "homedir.*"
-                          (regexp-quote (ert-resource-directory)))
+                          (regexp-quote (directory-file-name
+                                         (ert-resource-directory))))
                   (cdr (assq 'args atts))))
         (call-process "kill" nil nil nil (format "%d" pid))))))