[git] GPGME - branch, master, updated. gpgme-1.9.0-37-ga226eca

by Justus Winter cvs at cvs.gnupg.org
Wed May 10 15:55:45 CEST 2017 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  a226eca84670ef4e171c3a54e7caefb3a89254a4 (commit)
       via  15adff073bb89dc032d8342cfbbdad2850943f52 (commit)
       via  093b5497b7231590ce91ccf73ba64ebc0757f9e9 (commit)
      from  5e27bf98b4c48cf6a239bcc94b7b67515ff339e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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

commit 15adff073bb89dc032d8342cfbbdad2850943f52
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 10 15:49:54 2017 +0200

    tests: Harmonize test suites.
    
    * lang/python/tests/Makefile.am: Create test environment as part of
    'make all'.
    * tests/gpg/Makefile.am: Make sure the private keystore is created
    first.
    * tests/gpgsm/Makefile.am: Create test environment as part of
    'make all'.  Make sure the private keystore is created
    first.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 9c19a13..b62b524 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -71,7 +71,7 @@ check: xcheck
 
 .PHONY: xcheck
 
-xcheck: ./pubring-stamp
+xcheck:
 	$(TESTS_ENVIRONMENT) $(PYTHON) $(srcdir)/run-tests.py \
 	  --interpreters="$(PYTHONS)" --srcdir=$(srcdir) $(TESTFLAGS) \
 	  $(XTESTS)
@@ -93,6 +93,9 @@ clean-local:
 	-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
 
 
+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)
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 1d9a6df..ed1323b 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -95,7 +95,7 @@ export GPG_AGENT_INFO :=
         done
 	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
-./pubring-stamp: $(srcdir)/pubdemo.asc
+./pubring-stamp: $(srcdir)/pubdemo.asc ./private-keys-v1.d/gpg-sample.stamp
 	$(GPG) --batch --no-permission-warning \
                --import $(srcdir)/pubdemo.asc
 	-$(GPG) --batch --no-permission-warning \
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 46d6a9b..76e4938 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -44,7 +44,7 @@ noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
-CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
+CLEANFILES = pubring-stamp pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	random_seed S.gpg-agent
 
 clean-local:
@@ -62,16 +62,21 @@ export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
 
-./pubring.kbx: $(srcdir)/cert_g10code_test1.der
+BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
+           private-keys-v1.d/gpg-sample.stamp
+
+./pubring-stamp: $(srcdir)/cert_g10code_test1.der ./private-keys-v1.d/gpg-sample.stamp
 	$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
+	touch pubring-stamp
 
 ./gpgsm.conf:
 	echo disable-crl-checks > ./gpgsm.conf
 	echo faked-system-time 1008241200 >> ./gpgsm.conf
 
-./private-keys-v1.d/$(key_id).key: $(srcdir)/$(key_id)
+./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
 	$(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
 
 ./trustlist.txt:
 	echo $(key_id) > ./trustlist.txt

commit 093b5497b7231590ce91ccf73ba64ebc0757f9e9
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 10 15:23:56 2017 +0200

    qt: Stop agent on clean.
    
    * lang/qt/tests/Makefile.am (clean-local): Stop agent.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index ccad8c2..c4665df 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -70,6 +70,7 @@ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg.conf tofu.db
 
 clean-local:
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR  private-keys-v1.d crls.d
 
 export GNUPGHOME := $(abs_builddir)

-----------------------------------------------------------------------

Summary of changes:
 lang/python/tests/Makefile.am |  6 +++++-
 lang/qt/tests/Makefile.am     |  2 ++
 tests/gpg/Makefile.am         |  3 ++-
 tests/gpgsm/Makefile.am       | 12 +++++++++---
 4 files changed, 18 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org

More information about the Gnupg-commits mailing list