diff options
| author | Marcus Brinkmann <[email protected]> | 2011-05-11 00:32:20 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-05-11 00:32:20 +0000 |
| commit | d11500a77ef3ae1a9dad789f687d6faeb8f4cfe8 (patch) | |
| tree | 24247c2fb3087708fa0342d3fa443765fd84323b /tests/gpg | |
| parent | Update NEWS file. (diff) | |
| download | gpgme-d11500a77ef3ae1a9dad789f687d6faeb8f4cfe8.tar.gz gpgme-d11500a77ef3ae1a9dad789f687d6faeb8f4cfe8.zip | |
Clean up the tests correctly.
Diffstat (limited to '')
| -rw-r--r-- | tests/gpg/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/gpgsm/Makefile.am | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index bca36b0e..d4debd7c 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 be7f66be..9086134b 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 |