Clean up the tests correctly.

This commit is contained in:
Marcus Brinkmann 2011-05-11 02:32:20 +02:00
parent 6e32f8f0c1
commit d11500a77e
3 changed files with 22 additions and 6 deletions

View File

@ -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> 2011-05-05 Marcus Brinkmann <marcus@g10code.com>
* gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local * gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local

View File

@ -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-import t-trustlist t-edit t-keylist t-keylist-sig t-wait \
t-encrypt-large t-file-name t-gpgconf $(tests_unix) t-encrypt-large t-file-name t-gpgconf $(tests_unix)
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf 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 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 geheim.txt pubkey-1.asc seckey-1.asc pinentry
INCLUDES = -I$(top_builddir)/src INCLUDES = -I$(top_builddir)/src

View File

@ -40,14 +40,21 @@ noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \ CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
private-keys-v1.d/$(key_id).key random_seed 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 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 ./pubring.kbx: $(srcdir)/cert_g10code_test1.der
$(GPGSM) --homedir . --import $(srcdir)/cert_g10code_test1.der $(GPGSM) --import $(srcdir)/cert_g10code_test1.der
./gpgsm.conf: ./gpgsm.conf:
echo disable-crl-checks > ./gpgsm.conf echo disable-crl-checks > ./gpgsm.conf