diff options
| author | Justus Winter <[email protected]> | 2017-05-17 10:14:55 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-05-17 10:14:55 +0000 |
| commit | 0e1729bb993648deca84a2664ae78edc848d7003 (patch) | |
| tree | 26aa5304da0362fcd7e99c785cebb60b19416640 | |
| parent | g10: Fix gpgcompose.c. (diff) | |
| download | gnupg-0e1729bb993648deca84a2664ae78edc848d7003.tar.gz gnupg-0e1729bb993648deca84a2664ae78edc848d7003.zip | |
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 <[email protected]>
| -rw-r--r-- | tests/openpgp/defs.scm | 6 |
1 files 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 |