From c4663004d9718954527dce20c278ae7528fea3e3 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 20 Feb 2004 13:46:35 +0000
Subject: [PATCH] * Makefile.am: Reset GPG_AGENT_INFO here * runtest: and not
 anymore here.

---
 tests/ChangeLog   | 5 +++++
 tests/Makefile.am | 3 +--
 tests/runtest     | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index c6b3b9af1..68f9b4e21 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-20  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am: Reset GPG_AGENT_INFO here
+	* runtest: and not anymore here.
+
 2002-12-04  Werner Koch  <wk@gnupg.org>
 
 	* inittests (gpgsm.conf): Fake system time.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 622b5fe58..791829a07 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,8 +21,7 @@
 
 GPGSM = ../sm/gpgsm
 
-# We can't unset a variable here so we unset GPG_AGENT_INFO in runtest
-TESTS_ENVIRONMENT = GNUPGHOME=`pwd` LC_ALL=C GPGSM=$(GPGSM) \
+TESTS_ENVIRONMENT = GNUPGHOME=`pwd` GPG_AGENT_INFO= LC_ALL=C GPGSM=$(GPGSM) \
 		    LD_LIBRARY_PATH=$$(seen=0; \
                            for i in $(LDFLAGS) $(LIBGCRYPT_LIBS) $(PTH_LIBS); \
                            do \
diff --git a/tests/runtest b/tests/runtest
index 71385fb46..8d5078647 100755
--- a/tests/runtest
+++ b/tests/runtest
@@ -1,5 +1,4 @@
 #!/bin/sh
-unset GPG_AGENT_INFO
 [ -x "$1" ] && exec $1 $2
 exec ./asschk --no-echo -DGPGSM=${GPGSM} <"$1"