tests: Fix agent teardown in release builds.
authorJustus Winter <justus@g10code.com>
Wed, 17 May 2017 10:14:55 +0000 (12:14 +0200)
committerJustus Winter <justus@g10code.com>
Wed, 17 May 2017 10:14:55 +0000 (12:14 +0200)
* 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>
tests/openpgp/defs.scm

index 0cd45ad..a61e6c3 100644 (file)
              (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")
 ;; 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