security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

tests: Fix agent teardown in release builds.

Browse Source 
* 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: 2c9d9ac55ea455a5ec26428989dced0311ed46cc
Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-05-17 12:14:55 +02:00
parent ae95a7f533
commit 0e1729bb99
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/openpgp/defs.scm
View File

@ -448,7 +448,7 @@
(with-home-directory gnupghome (with-home-directory gnupghome
(stop-agent))))) (stop-agent)))))
(catch (log "Warning: Creating socket directory failed:" (car *error*)) (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 (call-check `(,(tool 'gpg-connect-agent) --verbose
,(string-append "--agent-program=" (tool 'gpg-agent) ,(string-append "--agent-program=" (tool 'gpg-agent)
"|--debug-quick-random") "|--debug-quick-random")
@ -457,9 +457,9 @@
;; Stop the agent and other daemons and remove the socket dir. ;; Stop the agent and other daemons and remove the socket dir.
(define (stop-agent) (define (stop-agent)
(log "Stopping gpg-agent...") (log "Stopping gpg-agent...")
(call-check `(,(tool 'gpgconf) --kill all)) (gpg-conf '--kill 'all)
(catch (log "Warning: Removing socket directory failed.") (catch (log "Warning: Removing socket directory failed.")
(call-popen `(,(tool 'gpgconf) --remove-socketdir) ""))) (gpg-conf '--remove-socketdir)))
;; end ;; end