From e4c0645c1eea9380d80a20895eb83c9dd7228776 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 14 Jul 2016 15:31:50 +0200 Subject: [PATCH] Qt: Fix tests if gpg2 is gpg * lang/qt/tests/Makefile.am (pubring-stamp): Loopback and provide passphrase on command line when importing. --- lang/qt/tests/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am index c49d85f8..e2ded78a 100644 --- a/lang/qt/tests/Makefile.am +++ b/lang/qt/tests/Makefile.am @@ -59,7 +59,8 @@ noinst_PROGRAMS = t-keylist t-keylocate t-ownertrust t-tofuinfo 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 pubring-stamp $(moc_files) + random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files) \ + gpg.conf clean-local: -rm -fR -- private-keys-v1.d @@ -68,9 +69,14 @@ export GNUPGHOME := $(abs_builddir) ./pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \ $(top_srcdir)/tests/gpg/secdemo.asc + echo "ignore-invalid-options" > gpg-agent.conf + echo "allow-loopback-pinentry" > gpg-agent.conf + echo "ignore-invalid-options" > gpg.conf + echo "pinentry-mode loopback" > gpg.conf $(GPG) --no-permission-warning \ --import $(top_srcdir)/tests/gpg/pubdemo.asc $(GPG) --no-permission-warning \ + --passphrase "abc" \ --import $(top_srcdir)/tests/gpg/secdemo.asc touch ./pubring-stamp