tests: Use --batch for gpg import.
authorWerner Koch <wk@gnupg.org>
Tue, 20 Sep 2016 17:51:02 +0000 (19:51 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 20 Sep 2016 17:51:02 +0000 (19:51 +0200)
* 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>
lang/python/tests/Makefile.am
tests/gpg/Makefile.am

index 6a315d7..0538e54 100644 (file)
@@ -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.
index e1c033b..9877843 100644 (file)
@@ -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.