diff options
| author | Marcus Brinkmann <[email protected]> | 2011-05-06 00:11:40 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-05-06 00:11:40 +0000 |
| commit | c79d8ad8189ff0a8c24547d4b0646247ca6f9a23 (patch) | |
| tree | a4c985765e25fda819ed8aac8cd45c81ddb513e6 /tests | |
| parent | Improve import tests for GnuPG 2.1. (diff) | |
| download | gpgme-c79d8ad8189ff0a8c24547d4b0646247ca6f9a23.tar.gz gpgme-c79d8ad8189ff0a8c24547d4b0646247ca6f9a23.zip | |
Make sure an existing agent doesn't interfere with test suite generation.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rw-r--r-- | tests/gpg/Makefile.am | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 47e502dc..795e5a8b 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2011-05-05 Marcus Brinkmann <[email protected]> + + * gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local + configuration. + (clean-local): Shut down local gpg-agent. + 2011-05-04 Marcus Brinkmann <[email protected]> * gpg/t-import.c (check_result): Complete secret key pair counting diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 3ca00cfc..bca36b0e 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -53,12 +53,15 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la noinst_PROGRAMS = $(TESTS) t-genkey clean-local: + -gpg-connect-agent KILLAGENT /bye -rm -fR private-keys-v1.d all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg export GNUPGHOME := $(abs_builddir) +export GPG_AGENT_INFO := + ./pubring.gpg: $(srcdir)/pubdemo.asc -$(GPG) --no-permission-warning \ --import $(srcdir)/pubdemo.asc |