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

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 47e502dcdae131dc7651515d6997dad525505abe..795e5a8b4f81e5fa00474032ab65806942996d19 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -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>
 
        * gpg/t-import.c (check_result): Complete secret key pair counting
 2011-05-04  Marcus Brinkmann  <marcus@g10code.com>
 
        * gpg/t-import.c (check_result): Complete secret key pair counting

diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 3ca00cfc7dacb40268cf6c48c82c2374af0d3f90..bca36b0ea048a0bf54ff34cdb1a17f8fc408621d 100644 (file)
--- 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:
 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)
 
        -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
 ./pubring.gpg: $(srcdir)/pubdemo.asc
        -$(GPG) --no-permission-warning \
                 --import $(srcdir)/pubdemo.asc