mirror of git://git.gnupg.org/gnupg.git
tests: Fix agent teardown in release builds.
* tests/openpgp/defs.scm (start-agent,stop-agent): Use gpg-conf which
will properly use the '--build-prefix' argument to make gpgconf use
tools from the build directory.
GnuPG-bug-id: 3165
Fixes-commit: 2c9d9ac55e
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
ae95a7f533
commit
0e1729bb99
|
@ -448,7 +448,7 @@
|
|||
(with-home-directory gnupghome
|
||||
(stop-agent)))))
|
||||
(catch (log "Warning: Creating socket directory failed:" (car *error*))
|
||||
(call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
|
||||
(gpg-conf '--create-socketdir))
|
||||
(call-check `(,(tool 'gpg-connect-agent) --verbose
|
||||
,(string-append "--agent-program=" (tool 'gpg-agent)
|
||||
"|--debug-quick-random")
|
||||
|
@ -457,9 +457,9 @@
|
|||
;; Stop the agent and other daemons and remove the socket dir.
|
||||
(define (stop-agent)
|
||||
(log "Stopping gpg-agent...")
|
||||
(call-check `(,(tool 'gpgconf) --kill all))
|
||||
(gpg-conf '--kill 'all)
|
||||
(catch (log "Warning: Removing socket directory failed.")
|
||||
(call-popen `(,(tool 'gpgconf) --remove-socketdir) "")))
|
||||
(gpg-conf '--remove-socketdir)))
|
||||
|
||||
|
||||
;; end
|
||||
|
|
Loading…
Reference in New Issue