Merge branch 'master' into passphrase-inquirebjk/passphrase-inquire

9 files changed, 59 insertions, 17 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4b465d8e..94eddac5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 
 TESTS = t-version t-data t-engine-info
 
-EXTRA_DIST = t-data-1.txt t-data-2.txt ChangeLog-2011
+EXTRA_DIST = start-stop-agent t-data-1.txt t-data-2.txt ChangeLog-2011
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5f40dfe2..107397b4 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -22,7 +22,8 @@
 GPG = gpg
 GPG_AGENT = gpg-agent
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+                    top_srcdir=$(top_srcdir)
 
 # The keylist tests must come after the import and the edit test.
 noinst_HEADERS = t-support.h
@@ -43,7 +44,7 @@ TESTS = initial.test $(c_tests) final.test
 
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
-	random_seed S.gpg-agent .gpg-v21-migrated
+	random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp
 
 private_keys = \
         13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
@@ -53,11 +54,12 @@ private_keys = \
         7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 
-EXTRA_DIST = start-stop-agent initial.test final.test \
+EXTRA_DIST = initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 
@@ -65,12 +67,16 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 noinst_PROGRAMS = $(c_tests) t-genkey
 
 clean-local:
-	-$(srcdir)/start-stop-agent --stop
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-check-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
+check-local: ./gpg.conf ./gpg-agent.conf ./pubring-stamp \
            ./private-keys-v1.d/gpg-sample.stamp
 
+# To guarantee that check-local is run before any tests we
+# add this dependency:
+initial.test : check-local
+
 export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
@@ -82,11 +88,12 @@ export GPG_AGENT_INFO :=
         done
 	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
-./pubring.gpg: $(srcdir)/pubdemo.asc
-	-$(GPG) --no-permission-warning \
-                --import $(srcdir)/pubdemo.asc
+./pubring-stamp: $(srcdir)/pubdemo.asc
+	$(GPG) --no-permission-warning \
+               --import $(srcdir)/pubdemo.asc
 	-$(GPG) --no-permission-warning \
 		--import $(srcdir)/secdemo.asc
+	touch ./pubring-stamp
 
 ./gpg.conf:
 # This is required for t-sig-notations.
diff --git a/tests/gpg/final.test b/tests/gpg/final.test
index 5148a34b..5289396f 100755
--- a/tests/gpg/final.test
+++ b/tests/gpg/final.test
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-${srcdir}/start-stop-agent --stop
+${top_srcdir}/tests/start-stop-agent --stop
 exit 0
diff --git a/tests/gpg/initial.test b/tests/gpg/initial.test
index 1981c99d..93c8621a 100755
--- a/tests/gpg/initial.test
+++ b/tests/gpg/initial.test
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-${srcdir}/start-stop-agent --start
+${top_srcdir}/tests/start-stop-agent --start
 exit 0
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index bf616d32..41645b6c 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -21,20 +21,26 @@
 
 GPGSM = gpgsm
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO= \
+                    top_srcdir=$(top_srcdir)
 
 noinst_HEADERS = t-support.h
-TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
+
+c_tests = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
+
+
+TESTS = initial.test $(c_tests) final.test
 
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
-	$(key_id)
+	$(key_id) initial.test final.test
 
 AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
+AM_LDFLAGS = -no-install
 LDADD = ../../src/libgpgme.la
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.
-noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
+noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
 
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
@@ -42,12 +48,16 @@ CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	random_seed S.gpg-agent
 
 clean-local:
-	-gpg-connect-agent KILLAGENT /bye
+	-$(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
 check-local: ./pubring.kbx ./gpgsm.conf \
              ./private-keys-v1.d/$(key_id).key ./trustlist.txt
 
+# To guarantee that check-local is run before any tests we add this
+# dependency:
+initial.test : check-local
+
 export GNUPGHOME := $(abs_builddir)
 
 export GPG_AGENT_INFO :=
diff --git a/tests/gpgsm/final.test b/tests/gpgsm/final.test
new file mode 100755
index 00000000..d0567e3f
--- /dev/null
+++ b/tests/gpgsm/final.test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+${top_srcdir}/tests/start-stop-agent --stop
+
+exit 0
diff --git a/tests/gpgsm/initial.test b/tests/gpgsm/initial.test
new file mode 100755
index 00000000..93c8621a
--- /dev/null
+++ b/tests/gpgsm/initial.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${top_srcdir}/tests/start-stop-agent --start
+exit 0
diff --git a/tests/run-keylist.c b/tests/run-keylist.c
index c0c72022..8abdf43d 100644
--- a/tests/run-keylist.c
+++ b/tests/run-keylist.c
@@ -45,6 +45,7 @@ show_usage (int ex)
          "  --verbose        run in verbose mode\n"
          "  --openpgp        use the OpenPGP protocol (default)\n"
          "  --cms            use the CMS protocol\n"
+         "  --secret         list only secret keys\n"
          "  --local          use GPGME_KEYLIST_MODE_LOCAL\n"
          "  --extern         use GPGME_KEYLIST_MODE_EXTERN\n"
          "  --sigs           use GPGME_KEYLIST_MODE_SIGS\n"
@@ -52,6 +53,7 @@ show_usage (int ex)
          "  --ephemeral      use GPGME_KEYLIST_MODE_EPHEMERAL\n"
          "  --validate       use GPGME_KEYLIST_MODE_VALIDATE\n"
          "  --import         import all keys\n"
+         "  --offline        use offline mode\n"
          , stderr);
   exit (ex);
 }
@@ -70,6 +72,8 @@ main (int argc, char **argv)
   gpgme_key_t keyarray[100];
   int keyidx = 0;
   gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP;
+  int only_secret = 0;
+  int offline = 0;
 
   if (argc)
     { argc--; argv++; }
@@ -99,6 +103,11 @@ main (int argc, char **argv)
           protocol = GPGME_PROTOCOL_CMS;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--secret"))
+        {
+          only_secret = 1;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--local"))
         {
           mode |= GPGME_KEYLIST_MODE_LOCAL;
@@ -134,6 +143,11 @@ main (int argc, char **argv)
           import = 1;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--offline"))
+        {
+          offline = 1;
+          argc--; argv++;
+        }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
 
@@ -150,7 +164,9 @@ main (int argc, char **argv)
 
   gpgme_set_keylist_mode (ctx, mode);
 
-  err = gpgme_op_keylist_start (ctx, argc? argv[0]:NULL, 0);
+  gpgme_set_offline (ctx, offline);
+
+  err = gpgme_op_keylist_start (ctx, argc? argv[0]:NULL, only_secret);
   fail_if_err (err);
 
   while (!(err = gpgme_op_keylist_next (ctx, &key)))
diff --git a/tests/gpg/start-stop-agent b/tests/start-stop-agent
index ab47d8d9..ab47d8d9 100755
--- a/tests/gpg/start-stop-agent
+++ b/tests/start-stop-agent