[git] GPGME - branch, master, updated. gpgme-1.1.8-180-gd11500a

[by Marcus Brinkmann]

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  d11500a77ef3ae1a9dad789f687d6faeb8f4cfe8 (commit)
      from  6e32f8f0c12b90e61d94b4c0779b7da4ea0252f5 (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 d11500a77ef3ae1a9dad789f687d6faeb8f4cfe8
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Wed May 11 02:32:20 2011 +0200

    Clean up the tests correctly.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 795e5a8..9c95489 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-11  Marcus Brinkmann  <marcus at g10code.com>
+
+	* gpgsm/Makefile.am (DISTCLEANFILES): Move to ...
+	(CLEANFILES): ... here.
+	(clean-local): New rule.
+	* gpg/Makefile.am (DISTCLEANFILES): Move to ...
+	(CLEANFILES): ... here.
+
 2011-05-05  Marcus Brinkmann  <marcus at g10code.com>
 
 	* gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index bca36b0..d4debd7 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -37,10 +37,11 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait	\
 	t-encrypt-large t-file-name t-gpgconf $(tests_unix)
 
-CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf
-DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf S.gpg-agent
+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
 
-EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+EXTRA_DIST = pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry
 
 INCLUDES = -I$(top_builddir)/src
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index be7f66b..9086134 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -40,14 +40,21 @@ noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
-DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
-	private-keys-v1.d/$(key_id).key random_seed
+CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
+	random_seed S.gpg-agent  
 
+clean-local:
+	-gpg-connect-agent KILLAGENT /bye
+	-rm -fR private-keys-v1.d
 
 all-local: ./pubring.kbx ./gpgsm.conf ./private-keys-v1.d/$(key_id).key ./trustlist.txt
 
+export GNUPGHOME := $(abs_builddir)
+
+export GPG_AGENT_INFO := 
+
 ./pubring.kbx: $(srcdir)/cert_g10code_test1.der
-	$(GPGSM) --homedir . --import $(srcdir)/cert_g10code_test1.der
+	$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
 
 ./gpgsm.conf:
 	echo disable-crl-checks > ./gpgsm.conf

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

Summary of changes:
 tests/ChangeLog         |    8 ++++++++
 tests/gpg/Makefile.am   |    7 ++++---
 tests/gpgsm/Makefile.am |   13 ++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)


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