Make sure an existing agent doesn't interfere with test suite generation.

This commit is contained in:
Marcus Brinkmann 2011-05-06 02:11:40 +02:00
parent 470899e3a7
commit c79d8ad818
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2011-05-05 Marcus Brinkmann <marcus@g10code.com>
* gpg/Makefile.am: Unset GPG_AGENT_INFO when setting up local
configuration.
(clean-local): Shut down local gpg-agent.
2011-05-04 Marcus Brinkmann <marcus@g10code.com> 2011-05-04 Marcus Brinkmann <marcus@g10code.com>
* gpg/t-import.c (check_result): Complete secret key pair counting * gpg/t-import.c (check_result): Complete secret key pair counting

View File

@ -53,12 +53,15 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la
noinst_PROGRAMS = $(TESTS) t-genkey noinst_PROGRAMS = $(TESTS) t-genkey
clean-local: clean-local:
-gpg-connect-agent KILLAGENT /bye
-rm -fR private-keys-v1.d -rm -fR private-keys-v1.d
all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg
export GNUPGHOME := $(abs_builddir) export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO :=
./pubring.gpg: $(srcdir)/pubdemo.asc ./pubring.gpg: $(srcdir)/pubdemo.asc
-$(GPG) --no-permission-warning \ -$(GPG) --no-permission-warning \
--import $(srcdir)/pubdemo.asc --import $(srcdir)/pubdemo.asc