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 /lang/qt/tests | |
| 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 'lang/qt/tests')
| -rw-r--r-- | lang/qt/tests/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
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 |