[Pkg-gnupg-commit] [gpgme] 37/103: tests: Make sure to kill all previously running daemons.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit a226eca84670ef4e171c3a54e7caefb3a89254a4
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 10 15:52:12 2017 +0200

    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 <justus at g10code.com>
---
 lang/python/tests/Makefile.am | 1 +
 lang/qt/tests/Makefile.am     | 1 +
 tests/gpg/Makefile.am         | 1 +
 tests/gpgsm/Makefile.am       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index b62b524..790d8f8 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -97,6 +97,7 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
            private-keys-v1.d/gpg-sample.stamp
 
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
+	-gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index c4665df..a662b4c 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -77,6 +77,7 @@ export GNUPGHOME := $(abs_builddir)
 
 pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
 	             $(top_srcdir)/tests/gpg/secdemo.asc
+	-gpgconf --kill all
 	echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
 	echo "allow-loopback-pinentry" >> gpg-agent.conf
 	echo "ignore-invalid-option pinentry-mode" > gpg.conf
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index ed1323b..b2e8837 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 76e4938..adae6a2 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git