[Pkg-gnupg-commit] [gpgme] 391/412: tests: Use --batch for gpg import.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit bfb6890ded99f040fe8ecf910f927a136e4acfda
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Sep 20 19:51:02 2016 +0200

    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 <wk at gnupg.org>
---
 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 6a315d7..0538e54 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 e1c033b..9877843 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git