[git] GnuPG - branch, master, updated. gnupg-2.2.7-378-g64b7c6f

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  64b7c6fd1945bc206cf56979633dfca8a7494374 (commit)
      from  c395f8315362793409be54aca630ce6e903ea984 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64b7c6fd1945bc206cf56979633dfca8a7494374
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Feb 21 12:26:09 2019 +0900

    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 at fsij.org>

diff --git a/tests/gpgme/gpgme-defs.scm b/tests/gpgme/gpgme-defs.scm
index 0de589f..bc40b3c 100644
--- 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 f118642..848bc75 100644
--- 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 6fbccfb..9090674 100755
--- 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 186efe0..85a0133 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -356,10 +356,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 4bff0a8..deb1854 100755
--- 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

-----------------------------------------------------------------------

Summary of changes:
 tests/gpgme/gpgme-defs.scm | 3 +--
 tests/gpgsm/gpgsm-defs.scm | 5 +----
 tests/inittests            | 1 +
 tests/openpgp/defs.scm     | 5 +----
 tests/pkits/inittests      | 1 +
 5 files changed, 5 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org