[git] GPGME - branch, master, updated. gpgme-1.5.4-4-ga5b040c

by Werner Koch cvs at cvs.gnupg.org
Mon Jun 8 10:45:15 CEST 2015 

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  a5b040cc57c65b3d105666b90c7eb59ee6ff3882 (commit)
      from  87d713ff41454bd08a345c63605f6fc7ac854dd4 (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 a5b040cc57c65b3d105666b90c7eb59ee6ff3882
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 8 10:43:29 2015 +0200

    Fix test suite for GnuPG 2.1 which uses pubring.kbx.
    
    * tests/gpgsm/final.test: New.
    * tests/gpgsm/initial.test: New.
    * tests/gpg/start-stop-agent: Move to ../.
    * tests/gpgsm/Makefile.am (TESTS_ENVIRONMENT): Export top_srcdir.
    (TESTS): Add intial.test and final.test.
    (AM_LDFLAGS): Add -no-install.
    (clean-local): Use start-stop-agent
    (initial.test): Add dependency.
    * tests/gpg/Makefile.am (top_srcdir): Export top_srcdir.
    (AM_LDFLAGS): Add -no-install.
    (check-local): Depend on pubring-stamp instead of pubring.gpg.
    (initial.test): Depend on check-local.
    (./pubring-gpg): Replace by rule for ./pubring-stamp.
    --
    
    There are also a couple of other changes which should make the tests a
    bit more robust and the gpg and gpgsm tests more similar.
    
    The -no-install avoids creating wrappers for test programs, which make
    debugging easier.
    
    The dependency on check-local guarantees that its rules are run before
    the first test.  This is important because conf files are setup by
    this rule.  Earlier automake versions seem to have run check-local
    always before the tests but today the order of execution is not
    defined.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4b465d8..94eddac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 
 TESTS = t-version t-data t-engine-info
 
-EXTRA_DIST = t-data-1.txt t-data-2.txt ChangeLog-2011
+EXTRA_DIST = start-stop-agent t-data-1.txt t-data-2.txt ChangeLog-2011
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5f40dfe..107397b 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -22,7 +22,8 @@
 GPG = gpg
 GPG_AGENT = gpg-agent
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+                    top_srcdir=$(top_srcdir)
 
 # The keylist tests must come after the import and the edit test.
 noinst_HEADERS = t-support.h
@@ -43,7 +44,7 @@ TESTS = initial.test $(c_tests) final.test
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
-	random_seed S.gpg-agent .gpg-v21-migrated
+	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp
 
 private_keys = \
         13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
@@ -53,11 +54,12 @@ private_keys = \
         7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 
-EXTRA_DIST = start-stop-agent initial.test final.test \
+EXTRA_DIST = initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 
@@ -65,12 +67,16 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 noinst_PROGRAMS = $(c_tests) t-genkey
 
 clean-local:
-	-$(srcdir)/start-stop-agent --stop
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-check-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
+check-local: ./gpg.conf ./gpg-agent.conf ./pubring-stamp \
            ./private-keys-v1.d/gpg-sample.stamp
 
+# To guarantee that check-local is run before any tests we
+# add this dependency:
+initial.test : check-local
+
 export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
@@ -82,11 +88,12 @@ export GPG_AGENT_INFO :=
         done
 	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
-./pubring.gpg: $(srcdir)/pubdemo.asc
-	-$(GPG) --no-permission-warning \
-                --import $(srcdir)/pubdemo.asc
+./pubring-stamp: $(srcdir)/pubdemo.asc
+	$(GPG) --no-permission-warning \
+               --import $(srcdir)/pubdemo.asc
 	-$(GPG) --no-permission-warning \
 		--import $(srcdir)/secdemo.asc
+	touch ./pubring-stamp
 
 ./gpg.conf:
 # This is required for t-sig-notations.
diff --git a/tests/gpg/final.test b/tests/gpg/final.test
index 5148a34..5289396 100755
--- a/tests/gpg/final.test
+++ b/tests/gpg/final.test
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-${srcdir}/start-stop-agent --stop
+${top_srcdir}/tests/start-stop-agent --stop
 exit 0
diff --git a/tests/gpg/initial.test b/tests/gpg/initial.test
index 1981c99..93c8621 100755
--- a/tests/gpg/initial.test
+++ b/tests/gpg/initial.test
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-${srcdir}/start-stop-agent --start
+${top_srcdir}/tests/start-stop-agent --start
 exit 0
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index bf616d3..41645b6 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -21,20 +21,26 @@
 
 GPGSM = gpgsm
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+                    top_srcdir=$(top_srcdir)
 
 noinst_HEADERS = t-support.h
-TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
+
+c_tests = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
+
+
+TESTS = initial.test $(c_tests) final.test
 
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
-	$(key_id)
+	$(key_id) initial.test final.test
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.
-noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
+noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
@@ -42,12 +48,16 @@ CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	random_seed S.gpg-agent
 
 clean-local:
-	-gpg-connect-agent KILLAGENT /bye
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
 check-local: ./pubring.kbx ./gpgsm.conf \
              ./private-keys-v1.d/$(key_id).key ./trustlist.txt
 
+# To guarantee that check-local is run before any tests we add this
+# dependency:
+initial.test : check-local
+
 export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
diff --git a/tests/gpgsm/final.test b/tests/gpgsm/final.test
new file mode 100755
index 0000000..d0567e3
--- /dev/null
+++ b/tests/gpgsm/final.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+${top_srcdir}/tests/start-stop-agent --stop
+
+exit 0
diff --git a/tests/gpgsm/initial.test b/tests/gpgsm/initial.test
new file mode 100755
index 0000000..93c8621
--- /dev/null
+++ b/tests/gpgsm/initial.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${top_srcdir}/tests/start-stop-agent --start
+exit 0
diff --git a/tests/gpg/start-stop-agent b/tests/start-stop-agent
similarity index 100%
rename from tests/gpg/start-stop-agent
rename to tests/start-stop-agent

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

Summary of changes:
 tests/Makefile.am                |  2 +-
 tests/gpg/Makefile.am            | 23 +++++++++++++++--------
 tests/gpg/final.test             |  2 +-
 tests/gpg/initial.test           |  2 +-
 tests/gpgsm/Makefile.am          | 20 +++++++++++++++-----
 tests/gpgsm/final.test           |  5 +++++
 tests/gpgsm/initial.test         |  4 ++++
 tests/{gpg => }/start-stop-agent |  0
 8 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100755 tests/gpgsm/final.test
 create mode 100755 tests/gpgsm/initial.test
 rename tests/{gpg => }/start-stop-agent (100%)


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

More information about the Gnupg-commits mailing list