aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2023-02-08 13:59:28 +0000
committerIngo Klöcker <[email protected]>2023-02-09 08:33:07 +0000
commit7098c14b231113055535abb14b4cde0c845f8728 (patch)
tree1811fdb1a78954d3528cefec331545e8ca26ed3d /tests
parenttests: Extend tests with an ultimately trusted key (diff)
downloadgpgme-7098c14b231113055535abb14b4cde0c845f8728.tar.gz
gpgme-7098c14b231113055535abb14b4cde0c845f8728.zip
tests: Stop daemons after setting up test environment
* lang/python/tests/Makefile.am, lang/qt/tests/Makefile.am, tests/gpg/Makefile.am, tests/json/Makefile.am (pubring-stamp): Call `gpgconf --kill all` after importing test keys. -- This ensures that no gpg-agents or other daemons are running after "make".
Diffstat (limited to 'tests')
-rw-r--r--tests/gpg/Makefile.am1
-rw-r--r--tests/json/Makefile.am1
2 files changed, 2 insertions, 0 deletions
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: