aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-09-19 15:28:29 +0000
committerWerner Koch <[email protected]>2018-09-20 10:13:03 +0000
commita824f4498ea9bae5dca515c56e2455ec0ce98b50 (patch)
tree8e6f348e39bcff10b1a5b6cb55af52fb799a76e7
parentdocs: python bindings and its special request (diff)
downloadgpgme-a824f4498ea9bae5dca515c56e2455ec0ce98b50.tar.gz
gpgme-a824f4498ea9bae5dca515c56e2455ec0ce98b50.zip
tests: Don't try using keys from a scmartcard.
* tests/gpg/Makefile.am: Disable scdaemon * lang/python/tests/Makefile.am: Ditto. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--lang/python/tests/Makefile.am4
-rw-r--r--tests/gpg/Makefile.am8
2 files changed, 11 insertions, 1 deletions
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 62970765..d9012853 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -119,3 +119,7 @@ gpg.conf:
gpg-agent.conf:
# This is required for gpg2, which does not support command fd.
echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@
+ echo disable-scdaemon >> $@
+
+
+# end-of-file
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 392fc898..ba2d1f3f 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -105,5 +105,11 @@ gpg.conf:
echo no-force-v3-sigs > ./gpg.conf
gpg-agent.conf:
-# This is required for gpg2, which does not support command fd.
+# This is required for gpg2, which does not support command fd for the
+# passphrase. disable-scdaemon is required so that we don't try using
+# a key from a smartcard reader (error might be: Unusable secret key)
echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf
+ echo disable-scdaemon >> ./gpg-agent.conf
+
+
+# end-of-file