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@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-20 19:51:02 +02:00
parent 29207bcd3b
commit bfb6890ded
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 6 additions and 6 deletions

View File

@ -100,11 +100,11 @@ initial.py: check-local
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./private-keys-v1.d/gpg-sample.stamp
./pubring-stamp: $(test_srcdir)/pubdemo.asc ./pubring-stamp: $(test_srcdir)/pubdemo.asc
$(GPG) --no-permission-warning \ $(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/pubdemo.asc --import $(test_srcdir)/pubdemo.asc
-$(GPG) --no-permission-warning \ -$(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/secdemo.asc --import $(test_srcdir)/secdemo.asc
touch ./pubring-stamp echo x > ./pubring-stamp
./gpg.conf: ./gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.

View File

@ -89,11 +89,11 @@ export GPG_AGENT_INFO :=
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./private-keys-v1.d/gpg-sample.stamp
./pubring-stamp: $(srcdir)/pubdemo.asc ./pubring-stamp: $(srcdir)/pubdemo.asc
$(GPG) --no-permission-warning \ $(GPG) --batch --no-permission-warning \
--import $(srcdir)/pubdemo.asc --import $(srcdir)/pubdemo.asc
-$(GPG) --no-permission-warning \ -$(GPG) --batch --no-permission-warning \
--import $(srcdir)/secdemo.asc --import $(srcdir)/secdemo.asc
touch ./pubring-stamp echo x > ./pubring-stamp
./gpg.conf: ./gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.