[Pkg-gnupg-commit] [gnupg2] 05/185: tests: Fix agent teardown in release builds.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 7 11:55:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 0e1729bb993648deca84a2664ae78edc848d7003
Author: Justus Winter <justus at g10code.com>
Date: Wed May 17 12:14:55 2017 +0200
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: 2c9d9ac55ea455a5ec26428989dced0311ed46cc
Signed-off-by: Justus Winter <justus at g10code.com>
---
tests/openpgp/defs.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 0cd45ad..a61e6c3 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list