* gpgsm/t-sign.c (main): Also test a normal signature.

* gpg/Makefile (TESTS_ENVIRONMENT): Set GPG_AGENT_INFO empty.
* gpg/t-signers.c, gpg/t-sign.c, gpg/t-encrypt-sym.c
* gpg/t-encrypt-sign.c, gpg/t-decrypt.c
* gpg/t-decrypt-verify.c (main): Changed the GPG_AGENT_INFO check to
match the one in ../../gpgme/rungpg.c.

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index e6bc099d..6b21d416 100644
--- a/tests/gpg/t-decrypt.c
+++ b/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);