7 files changed, 29 insertions, 11 deletions
diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index 04c0d110..456d63d3 100644
--- a/trunk/tests/gpg/Makefile.am
+++ b/trunk/tests/gpg/Makefile.am
@@ -21,7 +21,7 @@
 
 GPG = @GPG@
 
-TESTS_ENVIRONMENT = GNUPGHOME=.
+TESTS_ENVIRONMENT = GNUPGHOME=. GPG_AGENT_INFO=
 
 TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers	\
 	t-decrypt t-verify t-decrypt-verify t-keylist t-export	\
diff --git a/trunk/tests/gpg/t-decrypt-verify.c b/trunk/tests/gpg/t-decrypt-verify.c
index bf407eec..0c85d1be 100644
--- a/trunk/tests/gpg/t-decrypt-verify.c
+++ b/trunk/tests/gpg/t-decrypt-verify.c
@@ -101,12 +101,15 @@ main (int argc, char **argv)
   struct passphrase_cb_info_s info;
   const char *cipher_2_asc = mk_fname ("cipher-2.asc");
   GpgmeSigStat stat;
+  char *p;
 
   do
     {
       err = gpgme_new (&ctx);
       fail_if_err (err);
-      if (!getenv("GPG_AGENT_INFO"))
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
 	{
 	  memset (&info, 0, sizeof info);
 	  info.c = ctx;
diff --git a/trunk/tests/gpg/t-decrypt.c b/trunk/tests/gpg/t-decrypt.c
index e6bc099d..6b21d416 100644
--- a/trunk/tests/gpg/t-decrypt.c
+++ b/trunk/tests/gpg/t-decrypt.c
@@ -103,15 +103,19 @@ main (int argc, char **argv )
     GpgmeData in, out, pwdata = NULL;
     struct passphrase_cb_info_s info;
     const char *cipher_1_asc = mk_fname ("cipher-1.asc");
+    char *p;
 
   do {
     err = gpgme_new (&ctx);
     fail_if_err (err);
-    if ( !getenv("GPG_AGENT_INFO") ) {
+
+    p = getenv("GPG_AGENT_INFO");
+    if (!(p && strchr (p, ':')))
+      {
         memset ( &info, 0, sizeof info );
         info.c = ctx;
         gpgme_set_passphrase_cb ( ctx, passphrase_cb, &info );
-    } 
+      } 
 
     err = gpgme_data_new_from_file ( &in, cipher_1_asc, 1 );
     fail_if_err (err);
diff --git a/trunk/tests/gpg/t-encrypt-sign.c b/trunk/tests/gpg/t-encrypt-sign.c
index a4620d29..b92d74c8 100644
--- a/trunk/tests/gpg/t-encrypt-sign.c
+++ b/trunk/tests/gpg/t-encrypt-sign.c
@@ -90,6 +90,7 @@ main (int argc, char **argv )
     GpgmeError err;
     GpgmeData in, out;
     GpgmeRecipients rset;
+    char *p;
 
     err = gpgme_check_engine ();
     fail_if_err (err);
@@ -99,7 +100,9 @@ main (int argc, char **argv )
     err = gpgme_new (&ctx);
     fail_if_err (err);
     gpgme_set_armor (ctx, 1);
-    if (!getenv("GPG_AGENT_INFO"))
+
+    p = getenv("GPG_AGENT_INFO");
+    if (!(p && strchr (p, ':')))
       gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
 
     err = gpgme_data_new_from_mem ( &in, "Hallo Leute\n", 12, 0 );
diff --git a/trunk/tests/gpg/t-encrypt-sym.c b/trunk/tests/gpg/t-encrypt-sym.c
index 72672d3e..6c765b84 100644
--- a/trunk/tests/gpg/t-encrypt-sym.c
+++ b/trunk/tests/gpg/t-encrypt-sym.c
@@ -76,6 +76,7 @@ main (int argc, char **argv)
   GpgmeData plain, cipher;
   const char *text = "Hallo Leute\n";
   char *text2;
+  char *p;
   int i;
 
   err = gpgme_check_engine ();
@@ -86,8 +87,10 @@ main (int argc, char **argv)
       err = gpgme_new (&ctx);
       fail_if_err (err);
       gpgme_set_armor (ctx, 1);
-      if (!getenv("GPG_AGENT_INFO"))
-	gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
+        gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
 
       err = gpgme_data_new_from_mem (&plain, text, strlen (text), 0);
       fail_if_err (err);
diff --git a/trunk/tests/gpg/t-sign.c b/trunk/tests/gpg/t-sign.c
index 28c34dca..0e5f5c36 100644
--- a/trunk/tests/gpg/t-sign.c
+++ b/trunk/tests/gpg/t-sign.c
@@ -87,13 +87,15 @@ main (int argc, char **argv )
     GpgmeCtx ctx;
     GpgmeError err;
     GpgmeData in, out;
+    char *p;
 
   do {
     err = gpgme_new (&ctx);
     fail_if_err (err);
-    if ( !getenv("GPG_AGENT_INFO") ) {
-        gpgme_set_passphrase_cb ( ctx, passphrase_cb, NULL );
-    } 
+
+    p = getenv("GPG_AGENT_INFO");
+    if (!(p && strchr (p, ':')))
+      gpgme_set_passphrase_cb ( ctx, passphrase_cb, NULL );
 
     gpgme_set_textmode (ctx, 1);
     gpgme_set_armor (ctx, 1);
diff --git a/trunk/tests/gpg/t-signers.c b/trunk/tests/gpg/t-signers.c
index f3fa6f5c..d0aa00b3 100644
--- a/trunk/tests/gpg/t-signers.c
+++ b/trunk/tests/gpg/t-signers.c
@@ -86,6 +86,7 @@ main (int argc, char *argv[])
   GpgmeError err;
   GpgmeData in, out;
   GpgmeKey key[2];  /* There are two secret keys in the test area.  */
+  char *p;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -101,7 +102,9 @@ main (int argc, char *argv[])
     {
       err = gpgme_new (&ctx);
       fail_if_err (err);
-      if (!getenv ("GPG_AGENT_INFO"))
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
 	gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
       err = gpgme_signers_add (ctx, key[0]);
       fail_if_err (err);