mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-02 11:21:42 +00:00
Don't skip epg-tests even with gpg 2.0 (Bug#23561)
* test/lisp/epg-tests.el (epg-tests--config-program-alist): New constant, which allows gpg2 version 2.0+. (epg-tests-find-usable-gpg-configuration): Pass it to epg-find-configuration.
This commit is contained in:
parent
aeefbc41be
commit
1222ff5275
@ -30,8 +30,19 @@
|
||||
(expand-file-name "data/epg" (getenv "EMACS_TEST_DIRECTORY"))
|
||||
"Directory containing epg test data.")
|
||||
|
||||
(defconst epg-tests--config-program-alist
|
||||
;; The default `epg-config--program-alist' requires gpg2 2.1 or
|
||||
;; greater due to some practical problems with pinentry. But the
|
||||
;; tests here all work fine with 2.0 as well.
|
||||
(let ((prog-alist (copy-sequence epg-config--program-alist)))
|
||||
(setf (alist-get "gpg2"
|
||||
(alist-get 'OpenPGP prog-alist)
|
||||
nil nil #'equal)
|
||||
"2.0")
|
||||
prog-alist))
|
||||
|
||||
(defun epg-tests-find-usable-gpg-configuration (&optional _require-passphrase)
|
||||
(epg-find-configuration 'OpenPGP 'no-cache))
|
||||
(epg-find-configuration 'OpenPGP 'no-cache epg-tests--config-program-alist))
|
||||
|
||||
(defun epg-tests-passphrase-callback (_c _k _d)
|
||||
;; Need to create a copy here, since the string will be wiped out
|
||||
|
Loading…
Reference in New Issue
Block a user