Merge branch 'master' of /Users/ben/dev/hgit/mine/gnupg/gpgme/master into ben/python-docs-01

4 files changed, 20 insertions, 33 deletions

diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index 25b15f2b..3864f8ba 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -18,8 +18,6 @@
 
 GPG = gpg
 GPG_AGENT = gpg-agent
-export GNUPGHOME := $(abs_builddir)
-export GPG_AGENT_INFO :=
 
 test_srcdir = $(top_srcdir)/tests/gpg
 
@@ -79,7 +77,7 @@ xcheck:	all
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg-agent.conf pubring.kbx~ gpg.conf pubring.gpg~ \
 	random_seed .gpg-v21-migrated tofu.db \
-        pubring-stamp private-keys-v1.d/gpg-sample.stamp
+        pubring-stamp gpg-sample.stamp
 
 private_keys = \
         $(test_srcdir)/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
@@ -89,26 +87,25 @@ private_keys = \
         $(test_srcdir)/7A030357C0F253A5BBCD282FFC4E521B37558F5C
 
 clean-local:
-	-$(top_srcdir)/tests/start-stop-agent --stop
+	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
 
 
 BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
-           private-keys-v1.d/gpg-sample.stamp
+           gpg-sample.stamp
 
-private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-	-gpgconf --kill all
+gpg-sample.stamp: $(private_keys)
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
         done
-	echo x > ./private-keys-v1.d/gpg-sample.stamp
+	echo x > ./gpg-sample.stamp
 
-pubring-stamp: $(test_srcdir)/pubdemo.asc           \
-                 ./private-keys-v1.d/gpg-sample.stamp
-	$(GPG) --batch --no-permission-warning \
+pubring-stamp: $(test_srcdir)/pubdemo.asc gpg-sample.stamp
+	$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
                --import $(test_srcdir)/pubdemo.asc
-	-$(GPG) --batch --no-permission-warning \
+	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(test_srcdir)/secdemo.asc
 	echo x > ./pubring-stamp
 
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index a662b4cf..104672e4 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -70,21 +70,19 @@ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
 	gpg.conf tofu.db
 
 clean-local:
-	-$(top_srcdir)/tests/start-stop-agent --stop
+	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR  private-keys-v1.d crls.d
 
-export GNUPGHOME := $(abs_builddir)
-
 pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
 	             $(top_srcdir)/tests/gpg/secdemo.asc
-	-gpgconf --kill all
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	echo "ignore-invalid-option allow-loopback-pinentry" > $(abs_builddir)/gpg-agent.conf
 	echo "allow-loopback-pinentry" >> gpg-agent.conf
 	echo "ignore-invalid-option pinentry-mode" > gpg.conf
 	echo "pinentry-mode loopback" >> gpg.conf
-	$(GPG) --no-permission-warning \
+	$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
            --import $(top_srcdir)/tests/gpg/pubdemo.asc
-	$(GPG) --no-permission-warning \
+	$(TESTS_ENVIRONMENT) $(GPG) --no-permission-warning \
 		   --passphrase "abc" \
            --import $(top_srcdir)/tests/gpg/secdemo.asc
 	touch pubring-stamp
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 034bb5e0..b50f4b07 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -81,15 +81,11 @@ noinst_PROGRAMS = $(c_tests) $(tests_skipped)
 
 
 clean-local:
-	-$(top_srcdir)/tests/start-stop-agent --stop
+	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-export GNUPGHOME := $(abs_builddir)
-
-export GPG_AGENT_INFO :=
-
 gpg-sample.stamp: $(srcdir)/$(private_keys)
-	-gpgconf --kill all
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
@@ -97,9 +93,9 @@ gpg-sample.stamp: $(srcdir)/$(private_keys)
 	echo x > ./gpg-sample.stamp
 
 pubring-stamp: $(srcdir)/pubdemo.asc gpg-sample.stamp
-	$(GPG) --batch --no-permission-warning \
+	$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
                --import $(srcdir)/pubdemo.asc
-	-$(GPG) --batch --no-permission-warning \
+	-$(TESTS_ENVIRONMENT) $(GPG) --batch --no-permission-warning \
 		--import $(srcdir)/secdemo.asc
 	echo x > ./pubring-stamp
 
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 3b8eb725..d2acd05b 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -49,18 +49,14 @@ CLEANFILES = pubring-stamp pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	random_seed S.gpg-agent gpg-sample.stamp
 
 clean-local:
-	-$(top_srcdir)/tests/start-stop-agent --stop
+	-$(TESTS_ENVIRONMENT) $(top_srcdir)/tests/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-export GNUPGHOME := $(abs_builddir)
-
-export GPG_AGENT_INFO :=
-
 BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
            gpg-sample.stamp
 
 pubring-stamp: $(srcdir)/cert_g10code_test1.der gpg-sample.stamp
-	$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
+	$(TESTS_ENVIRONMENT) $(GPGSM) --import $(srcdir)/cert_g10code_test1.der
 	touch pubring-stamp
 
 gpgsm.conf:
@@ -69,7 +65,7 @@ gpgsm.conf:
 	echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpgsm.conf
 
 gpg-sample.stamp: $(srcdir)/$(key_id)
-	-gpgconf --kill all
+	-$(TESTS_ENVIRONMENT) gpgconf --kill all
 	$(MKDIR_P) ./private-keys-v1.d
 	cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
 	echo x > ./gpg-sample.stamp