aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpgsm
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2018-02-15 02:14:49 +0000
committerNIIBE Yutaka <[email protected]>2018-02-15 02:14:49 +0000
commitb5ec21b9baf017b4cee88c9ef3cc1a638547cd20 (patch)
tree59e689efa99da5e171a816b08fbc0ff937795c7f /tests/gpgsm
parentbuild: More Makefile fix. (diff)
downloadgpgme-b5ec21b9baf017b4cee88c9ef3cc1a638547cd20.tar.gz
gpgme-b5ec21b9baf017b4cee88c9ef3cc1a638547cd20.zip
tests: Makefile portability.
* tests/gpg/Makefile.am: Don't use "export" directive. * tests/gpgsm/Makefile.am: Ditto. * lang/qt/tests/Makefile.am: Ditto. * lang/python/tests/Makefile.am: Ditto. -- GnuPG-bug-id: 3056 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'tests/gpgsm')
-rw-r--r--tests/gpgsm/Makefile.am10
1 files changed, 3 insertions, 7 deletions
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