GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Make sure to kill all previously running daemons.

Browse Source 
* 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>
This commit is contained in:
Justus Winter 2017-05-10 15:52:12 +02:00
parent 15adff073b
commit a226eca846
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/python/tests/Makefile.am
View 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-v1.d/gpg-sample.stamp: $(private_keys) ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \ for k in $(private_keys); do \
cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \ cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \

1
lang/qt/tests/Makefile.am
View File

@ -77,6 +77,7 @@ export GNUPGHOME := $(abs_builddir)
pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \ pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
$(top_srcdir)/tests/gpg/secdemo.asc $(top_srcdir)/tests/gpg/secdemo.asc
-gpgconf --kill all
echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
echo "allow-loopback-pinentry" >> gpg-agent.conf echo "allow-loopback-pinentry" >> gpg-agent.conf
echo "ignore-invalid-option pinentry-mode" > gpg.conf echo "ignore-invalid-option pinentry-mode" > gpg.conf

1
tests/gpg/Makefile.am
View File

@ -89,6 +89,7 @@ export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO := export GPG_AGENT_INFO :=
./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys) ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \ for k in $(private_keys); do \
cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \ cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \

1
tests/gpgsm/Makefile.am
View File

@ -74,6 +74,7 @@ BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
echo faked-system-time 1008241200 >> ./gpgsm.conf echo faked-system-time 1008241200 >> ./gpgsm.conf
./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id) ./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./private-keys-v1.d/gpg-sample.stamp