1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

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 <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-09-24 10:35:05 +02:00
parent 25ad3c22d7
commit b19a60c6f7
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 38 additions and 13 deletions

View file

@ -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-keyboxd
(qualify (path-join "tests" "openpgp" name)
"keyboxd")
(in-srcdir "tests" "openpgp" name)
"--use-keyboxd")) all-tests)
;; The third pass uses the legact pubring.gpg
(map (lambda (name)
(test::scm setup-use-keyring
(qualify (path-join "tests" "openpgp" name)
"use-keyring")
"keyring")
(in-srcdir "tests" "openpgp" name)
"--use-keyring")) all-tests)
(map (lambda (name)
(test::scm setup-extended-key-format
(qualify (path-join "tests" "openpgp" name)
"extended-key-format")
(in-srcdir "tests" "openpgp" name)
"--extended-key-format")) all-tests))))
)))
tests)