From bfb6890ded99f040fe8ecf910f927a136e4acfda Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 20 Sep 2016 19:51:02 +0200 Subject: [PATCH] tests: Use --batch for gpg import. * lang/python/tests/Makefile.am (./pubring-stamp): Use --batch with GPG to avoid Pinentries during import when using GnuPG >= 2.1. Replace touch by echo. * tests/gpg/Makefile.am (./pubring-stamp): Ditto. Signed-off-by: Werner Koch --- lang/python/tests/Makefile.am | 6 +++--- tests/gpg/Makefile.am | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am index 6a315d7c..0538e54f 100644 --- a/lang/python/tests/Makefile.am +++ b/lang/python/tests/Makefile.am @@ -100,11 +100,11 @@ initial.py: check-local echo x > ./private-keys-v1.d/gpg-sample.stamp ./pubring-stamp: $(test_srcdir)/pubdemo.asc - $(GPG) --no-permission-warning \ + $(GPG) --batch --no-permission-warning \ --import $(test_srcdir)/pubdemo.asc - -$(GPG) --no-permission-warning \ + -$(GPG) --batch --no-permission-warning \ --import $(test_srcdir)/secdemo.asc - touch ./pubring-stamp + echo x > ./pubring-stamp ./gpg.conf: # This is required for t-sig-notations. diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index e1c033bf..98778438 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -89,11 +89,11 @@ export GPG_AGENT_INFO := echo x > ./private-keys-v1.d/gpg-sample.stamp ./pubring-stamp: $(srcdir)/pubdemo.asc - $(GPG) --no-permission-warning \ + $(GPG) --batch --no-permission-warning \ --import $(srcdir)/pubdemo.asc - -$(GPG) --no-permission-warning \ + -$(GPG) --batch --no-permission-warning \ --import $(srcdir)/secdemo.asc - touch ./pubring-stamp + echo x > ./pubring-stamp ./gpg.conf: # This is required for t-sig-notations.