diff options
| author | Ingo Klöcker <[email protected]> | 2021-07-08 10:18:45 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-07-08 10:18:45 +0000 |
| commit | a5662a801fc11a533fb3b1a69a17e119064972a3 (patch) | |
| tree | 8004aaf9b4bddfeefa6d9878ba45a01af5c7dae3 /tests | |
| parent | Make sure expiration time is interpreted as unsigned number (diff) | |
| download | gpgme-a5662a801fc11a533fb3b1a69a17e119064972a3.tar.gz gpgme-a5662a801fc11a533fb3b1a69a17e119064972a3.zip | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gpg/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/gpg/gpg.conf.in | 5 |
2 files changed, 7 insertions, 5 deletions
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 |