tests: Add "disable-scdaemon" in gpg-agent.conf.
authorNIIBE Yutaka <gniibe@fsij.org>
Thu, 21 Feb 2019 03:26:09 +0000 (12:26 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Thu, 21 Feb 2019 03:26:09 +0000 (12:26 +0900)
* 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>
tests/gpgme/gpgme-defs.scm
tests/gpgsm/gpgsm-defs.scm
tests/inittests
tests/openpgp/defs.scm
tests/pkits/inittests

index 0de589f..bc40b3c 100644 (file)
@@ -67,8 +67,7 @@
   (create-file
    "gpg-agent.conf"
    (string-append "pinentry-program " (tool 'pinentry))
-   (string-append "scdaemon-program " (tool 'scdaemon))
-   )
+   "disable-scdaemon")
 
   (start-agent)
 
index f118642..848bc75 100644 (file)
               "faked-system-time 1008241200")
   (create-file "gpg-agent.conf"
               (string-append "pinentry-program " (tool 'pinentry))
-              (if (assoc "scdaemon" gpg-components)
-                  (string-append "scdaemon-program " (tool 'scdaemon))
-                  "# No scdaemon available")
-              )
+              "disable-scdaemon")
   (start-agent)
   (create-file
    "trustlist.txt"
index 6fbccfb..9090674 100755 (executable)
@@ -85,6 +85,7 @@ EOF
 cat > gpg-agent.conf <<EOF
 no-grab
 pinentry-program /home/wk/work/pinentry/gtk/pinentry-gtk
+disable-scdaemon
 EOF
 
 cat > trustlist.txt <<EOF
index 186efe0..85a0133 100644 (file)
               (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.
index 4bff0a8..deb1854 100755 (executable)
@@ -94,6 +94,7 @@ EOF
 # Fixme: we need to write a dummy pinentry program
 cat > gpg-agent.conf <<EOF
 no-grab
+disable-scdaemon
 EOF
 
 # Mark the root CA trusted