aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/python/tests/Makefile.am1
-rw-r--r--lang/qt/tests/Makefile.am1
-rw-r--r--tests/gpg/Makefile.am1
-rw-r--r--tests/json/Makefile.am1
4 files changed, 4 insertions, 0 deletions
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 62dddaae..40a26e2a 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -107,6 +107,7 @@ pubring-stamp: $(test_srcdir)/pubdemo.asc gpg-sample.stamp
--import $(test_srcdir)/pubdemo.asc
-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/secdemo.asc
+ -$(TESTS_ENVIRONMENT) gpgconf --kill all
echo x > ./pubring-stamp
gpg.conf:
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 601d5062..d9713d90 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -136,6 +136,7 @@ pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
--passphrase "abc" \
--import $(top_srcdir)/tests/gpg/secdemo.asc
+ -$(TESTS_ENVIRONMENT) gpgconf --kill all
touch pubring-stamp
.cpp.moc:
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index c4a4ce42..6a82ca68 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -110,6 +110,7 @@ pubring-stamp: $(srcdir)/pubdemo.asc gpg-sample.stamp
--import $(srcdir)/secdemo.asc
-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
--import-ownertrust $(srcdir)/ownertrust.txt
+ -$(TESTS_ENVIRONMENT) gpgconf --kill all
echo x > ./pubring-stamp
gpg.conf: $(srcdir)/gpg.conf.in
diff --git a/tests/json/Makefile.am b/tests/json/Makefile.am
index 9b2cf71c..90fba79e 100644
--- a/tests/json/Makefile.am
+++ b/tests/json/Makefile.am
@@ -93,6 +93,7 @@ pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc gpg-sample.stamp
--import $(top_srcdir)/tests/gpg/pubdemo.asc
-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
--import $(top_srcdir)/tests/gpg/secdemo.asc
+ -$(TESTS_ENVIRONMENT) gpgconf --kill all
echo x > ./pubring-stamp
gpg.conf: