diff options
author | Werner Koch <wk@gnupg.org> | 2010-06-07 17:11:35 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2010-06-07 17:11:35 +0200 |
commit | c8eb7bd83995801023dbfe876ffd81c9a6ff9d41 (patch) | |
tree | cb99962c83aa90e38d7b44b39ee2a431f1afd7f3 /tests/openpgp/Makefile.am | |
parent | Add unfinished gpgtar. (diff) | |
download | gnupg2-c8eb7bd83995801023dbfe876ffd81c9a6ff9d41.tar.xz gnupg2-c8eb7bd83995801023dbfe876ffd81c9a6ff9d41.zip |
Change OpenPGP test framework to run under the control of the agent.
Diffstat (limited to 'tests/openpgp/Makefile.am')
-rw-r--r-- | tests/openpgp/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index fcce0e32a..0900e8f3e 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -23,6 +23,9 @@ GPG_IMPORT = ../../g10/gpg2 --homedir . \ required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \ ../../tools/gpg-connect-agent +TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \ + ../../agent/gpg-agent --quiet --daemon sh + TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ sigs.test sigs-dsa.test \ @@ -49,8 +52,6 @@ DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \ mkdemodirs signdemokey -# Note that removing S.gpg-agent forces a running gpg-agent to -# terminate after some time. CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \ *.test.log gpg_dearmor gpg.conf gpg-agent.conf S.gpg-agent \ @@ -67,6 +68,7 @@ distclean-local: prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./pubring.pkr ./secring.skr ./gpg_dearmor $(DATA_FILES) $(GPG_IMPORT) $(srcdir)/pubdemo.asc + cat $(srcdir)/gpg-agent.conf.tmpl > gpg-agent.conf echo timestamp >./prepared.stamp # We need to depend on a couple of programs so that the tests don't |