1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

tests: Add "disable-scdaemon" in gpg-agent.conf.

* tests/openpgp/defs.scm: Add "disable-scdaemon".  Remove
  "scdaemon-program".
* tests/gpgme/gpgme-defs.scm, tests/gpgsm/gpgsm-defs.scm: Likewise.
* tests/inittests, tests/pkits/inittests: Add "disable-scdaemon"

--

Before this change, running "make check" accesses USB device by
scdaemon on host computer.  If there is any smartcard/token available,
it may affect test results.  Because default key choice depends on
smartcard/token availability now and existing tests have nothing about
testing smartcard/token, disabling scdaemon is good.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 64b7c6fd19)
This commit is contained in:
NIIBE Yutaka 2019-02-21 12:26:09 +09:00 committed by Werner Koch
parent e7eafe1019
commit 150d545231
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
5 changed files with 5 additions and 10 deletions

View file

@ -355,10 +355,7 @@
(if (flag "--extended-key-format" *args*)
"enable-extended-key-format" "#enable-extended-key-format")
(string-append "pinentry-program " (tool 'pinentry))
(if (assoc "scdaemon" gpg-components)
(string-append "scdaemon-program " (tool 'scdaemon))
"# No scdaemon available")
))
"disable-scdaemon"))
;; Initialize the test environment, install appropriate configuration
;; and start the agent, without any keys.