mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
tests: Configure the environments to use scdaemon from build tree.
* tests/gpgme/gpgme-defs.scm: Use the scdaemon from the build tree when writing a 'gpg-agent.conf'. * tests/gpgsm/gpgsm-defs.scm: Likewise. * tests/openpgp/defs.scm: Likewise. -- As of 97a2394ecafaa6f58e4a1f70ecfd04408dc15606 gpg may query the scdaemon for a signing key to use. To make sure that the agent calls the right scdaemon, we provide the path explicitly in the 'gpg-agent.conf' that is used in the tests, similar to what we do for the agent itself and the pinentry. GnuPG-bug-id: 3165 Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
99e68350a8
commit
386a7bbb24
@ -66,7 +66,9 @@
|
||||
(string-append "agent-program " (tool 'gpg-agent) "|--debug-quick-random\n"))
|
||||
(create-file
|
||||
"gpg-agent.conf"
|
||||
(string-append "pinentry-program " (tool 'pinentry)))
|
||||
(string-append "pinentry-program " (tool 'pinentry))
|
||||
(string-append "scdaemon-program " (tool 'scdaemon))
|
||||
)
|
||||
|
||||
(start-agent)
|
||||
|
||||
|
@ -66,7 +66,9 @@
|
||||
"disable-crl-checks"
|
||||
"faked-system-time 1008241200")
|
||||
(create-file "gpg-agent.conf"
|
||||
(string-append "pinentry-program " (tool 'pinentry)))
|
||||
(string-append "pinentry-program " (tool 'pinentry))
|
||||
(string-append "scdaemon-program " (tool 'scdaemon))
|
||||
)
|
||||
(start-agent)
|
||||
(create-file
|
||||
"trustlist.txt"
|
||||
|
@ -349,6 +349,7 @@
|
||||
"no-grab"
|
||||
"enable-ssh-support"
|
||||
(string-append "pinentry-program " (tool 'pinentry))
|
||||
(string-append "scdaemon-program " (tool 'scdaemon))
|
||||
))
|
||||
|
||||
;; Initialize the test environment, install appropriate configuration
|
||||
|
Loading…
x
Reference in New Issue
Block a user