diff options
Diffstat (limited to 'tests/openpgp/all-tests.scm')
| -rw-r--r-- | tests/openpgp/all-tests.scm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm index 6584df26e..4dd6d6fe1 100644 --- a/tests/openpgp/all-tests.scm +++ b/tests/openpgp/all-tests.scm @@ -33,13 +33,19 @@ (path-join "tests" "openpgp" "setup.scm") (in-srcdir "tests" "openpgp" "setup.scm")))) - (define setup-use-keyring + (define (qualify path variant) + (string-append "<" variant ">" path)) + + (define (setup* variant) (make-environment-cache (test::scm #f - (string-append "<use-keyring>" (path-join "tests" "openpgp" "setup.scm")) + (qualify (path-join "tests" "openpgp" "setup.scm") variant) (in-srcdir "tests" "openpgp" "setup.scm") - "--use-keyring"))) + (string-append "--" variant)))) + + (define setup-use-keyring (setup* "use-keyring")) + (define setup-extended-key-format (setup* "extended-key-format")) (define all-tests (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am") @@ -52,7 +58,11 @@ (in-srcdir "tests" "openpgp" name))) all-tests) (map (lambda (name) (test::scm setup-use-keyring - (string-append "<use-keyring>" - (path-join "tests" "openpgp" name)) + (qualify (path-join "tests" "openpgp" name) "use-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) - "--use-keyring")) all-tests))) + "--extended-key-format")) all-tests))) |