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 64b7c6fd1945bc206cf56979633dfca8a7494374)
(cherry picked from commit 150d5452318eafa6aa800ff3b87f8f8eb35ed203)

Gbp-Pq: Topic from-2.2.14
Gbp-Pq: Name tests-Add-disable-scdaemon-in-gpg-agent.conf.patch

diff --git a/tests/gpgme/gpgme-defs.scm b/tests/gpgme/gpgme-defs.scm
index 0de589ffe0cf5b8c98dcfcc8e0e16952e6422480..bc40b3c7665dc54308c3a76ec53f2f0367caa89d 100644 (file)
--- a/tests/gpgme/gpgme-defs.scm
+++ b/tests/gpgme/gpgme-defs.scm
@@ -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)
 

diff --git a/tests/gpgsm/gpgsm-defs.scm b/tests/gpgsm/gpgsm-defs.scm
index f118642015ee12b7087e2089921ad3a0f27a76fb..848bc7581210bb1e75cce3e53d57760c46d80734 100644 (file)
--- a/tests/gpgsm/gpgsm-defs.scm
+++ b/tests/gpgsm/gpgsm-defs.scm
@@ -67,10 +67,7 @@
               "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"

diff --git a/tests/inittests b/tests/inittests
index 6fbccfb0f4c3dd00247806d9e61c9b89d51fa5f2..9090674e3fa5232ab6fbd9d47f8faa04e818182e 100755 (executable)
--- a/tests/inittests
+++ b/tests/inittests
@@ -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

diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 7e41d19bffd0eefa11ce0a0d7876613ee283072e..94c5bebeaa43e388ee263de28529ec4e09e6c07e 100644 (file)
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -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.

diff --git a/tests/pkits/inittests b/tests/pkits/inittests
index 4bff0a8b8c09cfb5f6b7913b9129ed83d2a6dc5b..deb185439a81ad2df45e73c0652540c3e7197644 100755 (executable)
--- a/tests/pkits/inittests
+++ b/tests/pkits/inittests
@@ -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