tests: Make sure to kill all previously running daemons.
authorJustus Winter <justus@g10code.com>
Wed, 10 May 2017 13:52:12 +0000 (15:52 +0200)
committerJustus Winter <justus@g10code.com>
Wed, 10 May 2017 13:52:12 +0000 (15:52 +0200)
* 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@g10code.com>
lang/python/tests/Makefile.am
lang/qt/tests/Makefile.am
tests/gpg/Makefile.am
tests/gpgsm/Makefile.am

index b62b524..790d8f8 100644 (file)
@@ -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; \
index c4665df..a662b4c 100644 (file)
@@ -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
index ed1323b..b2e8837 100644 (file)
@@ -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; \
index 76e4938..adae6a2 100644 (file)
@@ -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