From a5662a801fc11a533fb3b1a69a17e119064972a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 8 Jul 2021 12:18:45 +0200 Subject: [PATCH] core: Ensure gpg.conf for tests is recreated if necessary * tests/gpg/gpg.conf.in: New. * tests/gpg/Makefile.am (gpg.conf): Copy gpg.conf.in instead of using echo to fill gpg.conf. -- This change ensures that gpg.conf is updated whenever new options are added for some tests. --- tests/gpg/Makefile.am | 7 ++----- tests/gpg/gpg.conf.in | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 tests/gpg/gpg.conf.in diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am index d24a312f..bb90ccb6 100644 --- a/tests/gpg/Makefile.am +++ b/tests/gpg/Makefile.am @@ -101,11 +101,8 @@ pubring-stamp: $(srcdir)/pubdemo.asc gpg-sample.stamp --import $(srcdir)/secdemo.asc echo x > ./pubring-stamp -gpg.conf: -# This is required for t-sig-notations. - echo no-force-v3-sigs > ./gpg.conf -# This is required for t-edit-sign. - echo allow-weak-key-signatures >> ./gpg.conf +gpg.conf: $(srcdir)/gpg.conf.in + cp $(srcdir)/gpg.conf.in gpg.conf gpg-agent.conf: # This is required for gpg2, which does not support command fd for the diff --git a/tests/gpg/gpg.conf.in b/tests/gpg/gpg.conf.in new file mode 100644 index 00000000..ab05c175 --- /dev/null +++ b/tests/gpg/gpg.conf.in @@ -0,0 +1,5 @@ +# This is required for t-sig-notations. +no-force-v3-sigs + +# This is required for t-edit-sign. +allow-weak-key-signatures