aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-09-20 17:51:02 +0000
committerWerner Koch <[email protected]>2016-09-20 17:51:02 +0000
commitbfb6890ded99f040fe8ecf910f927a136e4acfda (patch)
treeb41852f4f30382595afa8381b55287fa02d9e027 /tests
parenttests: Improve portability. (diff)
downloadgpgme-bfb6890ded99f040fe8ecf910f927a136e4acfda.tar.gz
gpgme-bfb6890ded99f040fe8ecf910f927a136e4acfda.zip
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 <[email protected]>
Diffstat (limited to 'tests')
-rw-r--r--tests/gpg/Makefile.am6
1 files changed, 3 insertions, 3 deletions
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.