Clean up the tests correctly.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 795e5a8b4f81e5fa00474032ab65806942996d19..9c954896380d8b1c05bea5b454feba9425ad7d12 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-11  Marcus Brinkmann  <marcus@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@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 bca36b0ea048a0bf54ff34cdb1a17f8fc408621d..d4debd7c5d5ddbbb3f5e13785e44a86e68200947 100644 (file)
--- 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 be7f66be95b7a721df30497df827f0250606617c..9086134bda11195a393b0356d6394f0ef9065a2a 100644 (file)
--- 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