Some tweaks to the agent startup.

tests/openpgp/Makefile.am

@@ -16,15 +16,14 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 # Process this file with automake to create Makefile.in
 
-GPG_IMPORT = ../../g10/gpg2 --homedir . \
+GPG_IMPORT = ../../g10/gpg2 --homedir $(abs_builddir) \
               --quiet --yes --no-permission-warning --import
 
 # Programs required before we can run these tests.
 required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
                 ../../tools/gpg-connect-agent
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
-		    ../../agent/gpg-agent --quiet --daemon sh
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
 
 TESTS = version.test mds.test \
 	decrypt.test decrypt-dsa.test \
@@ -68,7 +67,6 @@ distclean-local:
 prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 		./pubring.pkr ./secring.skr ./gpg_dearmor $(DATA_FILES)
 	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc	 
-	 cat $(srcdir)/gpg-agent.conf.tmpl > gpg-agent.conf
 	 echo timestamp >./prepared.stamp
 
 # We need to depend on a couple of programs so that the tests don't

tests/openpgp/defs.inc

@@ -1,6 +1,6 @@
 # Definitions for the OpenPGP test scripts                     -*- sh -*-
 # Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
-#           2007 Free Software Foundation, Inc.
+#           2007, 2010 Free Software Foundation, Inc.
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.  This file is
@@ -161,8 +161,19 @@ pgmname=`basename $0`
 
 [ -z "$srcdir" ] && fatal "not called from make"
 
+# Always work in the current directory.  We set GNUPGHOME only if it
+# has not been set already.  Usually it is set through the Makefile's
+# TESTS_ENVIRONMENT macro.
+if [ -z "$GNUPGHOME" ]; then
+  GNUPGHOME=`/bin/pwd`
+  export GNUPGHOME
+elif [ "$GNUPGHOME" != `/bin/pwd` ]; then
+  echo "$pgmname: GNUPGHOME not set to the cwd" $* >&2
+  exit 1
+fi
+
 # Make sure we have a valid option files even with VPATH builds.
-for f in gpg.conf ; do 
+for f in gpg.conf gpg-agent.conf ; do 
   if [ -f ./$f ]; then
     :
   elif [ -f $srcdir/$f.tmpl ]; then
@@ -170,17 +181,7 @@ for f in gpg.conf ; do
   fi
 done
 
-# Always work in the current directory.  We set GNUPGHOME only if it
-# has not been set already.  Usually it is set through the Makefile's
-# TESTS_ENVIRONMENT macro.
-if [ -z "$GNUPGHOME" ]; then
-  GNUPGHOME=`pwd`
-  export GNUPGHOME
-elif [ "$GNUPGHOME" != `pwd` ]; then
-  echo "$pgmname: GNUPGHOME not set to the cwd" $* >&2
-  exit 1
-fi
-
+# (--no-permission-warning makes only sense on the commandline)
 GPG="../../g10/gpg2 --no-permission-warning "
 
 echo "Test: $pgmname"                  >  ${pgmname}.log

tests/openpgp/gpg-agent.conf.tmpl

@@ -1,2 +1,3 @@
-no-use-standard-socket
+use-standard-socket
+