security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

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

Browse Source 
* 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>
This commit is contained in:
NIIBE Yutaka 2019-02-21 12:26:09 +09:00
parent c395f83153
commit 64b7c6fd19
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/gpgme/gpgme-defs.scm
View File

@ -67,8 +67,7 @@
(create-file (create-file
"gpg-agent.conf" "gpg-agent.conf"
(string-append "pinentry-program " (tool 'pinentry)) (string-append "pinentry-program " (tool 'pinentry))
(string-append "scdaemon-program " (tool 'scdaemon)) "disable-scdaemon")
)
(start-agent) (start-agent)

5
tests/gpgsm/gpgsm-defs.scm
View File

@ -67,10 +67,7 @@
"faked-system-time 1008241200") "faked-system-time 1008241200")
(create-file "gpg-agent.conf" (create-file "gpg-agent.conf"
(string-append "pinentry-program " (tool 'pinentry)) (string-append "pinentry-program " (tool 'pinentry))
(if (assoc "scdaemon" gpg-components) "disable-scdaemon")
(string-append "scdaemon-program " (tool 'scdaemon))
"# No scdaemon available")
)
(start-agent) (start-agent)
(create-file (create-file
"trustlist.txt" "trustlist.txt"

1
tests/inittests
View File

@ -85,6 +85,7 @@ EOF
cat > gpg-agent.conf <<EOF cat > gpg-agent.conf <<EOF
no-grab no-grab
pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk
disable-scdaemon
EOF EOF
cat > trustlist.txt <<EOF cat > trustlist.txt <<EOF

5
tests/openpgp/defs.scm
View File

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

1
tests/pkits/inittests
View File

@ -94,6 +94,7 @@ EOF
# Fixme: we need to write a dummy pinentry program # Fixme: we need to write a dummy pinentry program
cat > gpg-agent.conf <<EOF cat > gpg-agent.conf <<EOF
no-grab no-grab
disable-scdaemon
EOF EOF
# Mark the root CA trusted # Mark the root CA trusted