1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

; Trace epg-tests gpg config finding (Bug#23561)

This commit is contained in:
Noam Postavsky 2018-07-14 08:58:26 -04:00
parent 9f25231f35
commit 5936f6cdac
2 changed files with 15 additions and 1 deletions

View File

@ -169,6 +169,7 @@ WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; }
ifdef EMACS_HYDRA_CI
## On Hydra, always show logs for certain problematic tests.
lisp/net/tramp-tests.log \
lisp/epg-tests.log \
: WRITE_LOG = 2>&1 | tee $@
endif

View File

@ -23,6 +23,7 @@
(require 'ert)
(require 'epg)
(require 'trace)
(defvar epg-tests-context nil)
@ -42,7 +43,19 @@
prog-alist))
(defun epg-tests-find-usable-gpg-configuration (&optional _require-passphrase)
(epg-find-configuration 'OpenPGP 'no-cache epg-tests--config-program-alist))
;; Tracing for Bug#23561, but only do it once per run.
(if (get-buffer "*trace-output*")
(epg-find-configuration 'OpenPGP 'no-cache epg-tests--config-program-alist)
(dolist (fun '(epg-find-configuration
executable-find
epg-check-configuration
epg-config--make-gpg-configuration))
(trace-function-background fun))
(prog1 (unwind-protect
(epg-find-configuration 'OpenPGP 'no-cache epg-tests--config-program-alist)
(untrace-all))
(princ (with-current-buffer "*trace-output*" (buffer-string))
#'external-debugging-output))))
(defun epg-tests-passphrase-callback (_c _k _d)
;; Need to create a copy here, since the string will be wiped out