diff options
| author | Justus Winter <[email protected]> | 2017-05-10 13:52:12 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-05-10 13:52:12 +0000 |
| commit | a226eca84670ef4e171c3a54e7caefb3a89254a4 (patch) | |
| tree | 7f64c20aa7b26c7395c2037995801b91e2e01f9c /tests | |
| parent | tests: Harmonize test suites. (diff) | |
| download | gpgme-a226eca84670ef4e171c3a54e7caefb3a89254a4.tar.gz gpgme-a226eca84670ef4e171c3a54e7caefb3a89254a4.zip | |
tests: Make sure to kill all previously running daemons.
* lang/python/tests/Makefile.am: Kill all previously running daemons
before creating the private key store.
* lang/qt/tests/Makefile.am: Likewise.
* tests/gpg/Makefile.am: Likewise.
* tests/gpgsm/Makefile.am: Likewise.
--
Now that the daemons sockets are no longer created in the GNUPGHOME,
we cannot rely on cleaning the build directory to make sure they are
shut down. Therefore, we explicitly kill any running daemons when
creating the test environment.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gpg/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/gpgsm/Makefile.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index ed1323b4..b2e8837a 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -89,6 +89,7 @@ export GNUPGHOME := $(abs_builddir) export GPG_AGENT_INFO := ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys) + -gpgconf --kill all $(MKDIR_P) ./private-keys-v1.d for k in $(private_keys); do \ cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \ diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index 76e49383..adae6a23 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -74,6 +74,7 @@ BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \ echo faked-system-time 1008241200 >> ./gpgsm.conf ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id) + -gpgconf --kill all $(MKDIR_P) ./private-keys-v1.d cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key echo x > ./private-keys-v1.d/gpg-sample.stamp |