From c79d8ad8189ff0a8c24547d4b0646247ca6f9a23 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 6 May 2011 02:11:40 +0200 Subject: [PATCH] Make sure an existing agent doesn't interfere with test suite generation. --- tests/ChangeLog | 6 ++++++ tests/gpg/Makefile.am | 3 +++ 2 files changed, 9 insertions(+) diff --git a/tests/ChangeLog b/tests/ChangeLog index 47e502d..795e5a8 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2011-05-05 Marcus Brinkmann + + * gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local + configuration. + (clean-local): Shut down local gpg-agent. + 2011-05-04 Marcus Brinkmann * gpg/t-import.c (check_result): Complete secret key pair counting diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index 3ca00cf..bca36b0 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 -- 2.26.2