diff options
| author | Ben McGinnes <[email protected]> | 2018-02-15 15:04:57 +0000 |
|---|---|---|
| committer | Ben McGinnes <[email protected]> | 2018-02-15 15:04:57 +0000 |
| commit | 2b092bf235160e04c10480c47c0fd6dce4e770c4 (patch) | |
| tree | f171ad3b31f66a0fbc480be4286c8e7dc9a3ce99 /tests/gpgsm | |
| parent | LaTeX margins (diff) | |
| parent | tests: Fix previous commit (diff) | |
| download | gpgme-2b092bf235160e04c10480c47c0fd6dce4e770c4.tar.gz gpgme-2b092bf235160e04c10480c47c0fd6dce4e770c4.zip | |
Merge branch 'master' of /Users/ben/dev/hgit/mine/gnupg/gpgme/master into ben/python-docs-01
Diffstat (limited to 'tests/gpgsm')
| -rw-r--r-- | tests/gpgsm/Makefile.am | 10 |
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 |