From 0e1729bb993648deca84a2664ae78edc848d7003 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 17 May 2017 12:14:55 +0200 Subject: 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 --- 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 0cd45ad14..a61e6c318 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 -- cgit v1.2.3