diff options
| author | Werner Koch <[email protected]> | 2020-09-24 08:35:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-09-24 08:37:42 +0000 |
| commit | b19a60c6f7e892635db9e22499a7a44087c86c41 (patch) | |
| tree | 1f3a7859eb61c8bfff903d1f07747d83ec655feb /tests/openpgp/all-tests.scm | |
| parent | keyboxd: Implement multiple search descriptions. (diff) | |
| download | gnupg-b19a60c6f7e892635db9e22499a7a44087c86c41.tar.gz gnupg-b19a60c6f7e892635db9e22499a7a44087c86c41.zip | |
tests: Integrate --use-keyboxd into the OpenPGP test suite.
* tests/openpgp/all-tests.scm (all-tests): Replace extended-key-format
mode with a new keyboxd mode.
* tests/openpgp/defs.scm (create-gpghome): Ditto.
* tests/openpgp/gpgv.scm: Adjust for keyboxd mode.
* tests/openpgp/issue2419.scm: Fix to allow setting a log-file into
gpg.conf for debugging.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tests/openpgp/all-tests.scm')
| -rw-r--r-- | tests/openpgp/all-tests.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm index e12b175b9..046012cfa 100644 --- a/tests/openpgp/all-tests.scm +++ b/tests/openpgp/all-tests.scm @@ -45,7 +45,7 @@ (string-append "--" variant)))) (define setup-use-keyring (setup* "use-keyring")) - (define setup-extended-key-format (setup* "extended-key-format")) + (define setup-use-keyboxd (setup* "use-keyboxd")) (define all-tests (parse-makefile-expand "Makefile" @@ -55,24 +55,27 @@ (define tests (map (lambda (name) (test::scm setup - (path-join "tests" "openpgp" name) + (qualify (path-join "tests" "openpgp" name) "standard") (in-srcdir "tests" "openpgp" name))) all-tests)) (when *run-all-tests* (set! tests (append tests + ;; The second pass uses the keyboxd (map (lambda (name) - (test::scm setup-use-keyring + (test::scm setup-use-keyboxd (qualify (path-join "tests" "openpgp" name) - "use-keyring") + "keyboxd") (in-srcdir "tests" "openpgp" name) - "--use-keyring")) all-tests) + "--use-keyboxd")) all-tests) + ;; The third pass uses the legact pubring.gpg (map (lambda (name) - (test::scm setup-extended-key-format + (test::scm setup-use-keyring (qualify (path-join "tests" "openpgp" name) - "extended-key-format") + "keyring") (in-srcdir "tests" "openpgp" name) - "--extended-key-format")) all-tests)))) + "--use-keyring")) all-tests) + ))) tests) |