mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
tests: Fix to support --enable-all-tests and variants.
* tests/gpgscm/tests.scm (test::scm): Add VARIANT argument. (tests::new): Likewise. (open-log-file, report): Support VARIANT. * tests/gpgme/all-tests.scm (setup-c, setup-py): Follow the change. * tests/cms/all-tests.scm: Likewise. * tests/cms/run-tests.scm: Likewise. * tests/migrations/all-tests.scm: Likewise. * tests/migrations/run-tests.scm: Likewise. * tests/openpgp/all-tests.scm: Likewise. * tests/openpgp/run-tests.scm: Likewise. -- Forward port from 2.2 branch of:0fd7a90207
Fixes-commit:1c88104a3f
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
7071f30762
commit
1246e16432
8 changed files with 36 additions and 16 deletions
|
@ -29,6 +29,7 @@
|
|||
(define setup
|
||||
(make-environment-cache
|
||||
(test::scm
|
||||
#f
|
||||
#f
|
||||
(path-join "tests" "openpgp" "setup.scm")
|
||||
(in-srcdir "tests" "openpgp" "setup.scm"))))
|
||||
|
@ -40,7 +41,8 @@
|
|||
(make-environment-cache
|
||||
(test::scm
|
||||
#f
|
||||
(qualify (path-join "tests" "openpgp" "setup.scm") variant)
|
||||
variant
|
||||
(path-join "tests" "openpgp" "setup.scm")
|
||||
(in-srcdir "tests" "openpgp" "setup.scm")
|
||||
(string-append "--" variant))))
|
||||
|
||||
|
@ -62,7 +64,8 @@
|
|||
(define tests
|
||||
(map (lambda (name)
|
||||
(test::scm setup
|
||||
(qualify (path-join "tests" "openpgp" name) "standard")
|
||||
"standard"
|
||||
(path-join "tests" "openpgp" name)
|
||||
(in-srcdir "tests" "openpgp" name))) all-tests))
|
||||
|
||||
(when *run-all-tests*
|
||||
|
@ -73,17 +76,16 @@
|
|||
(if keyboxd-enabled?
|
||||
(map (lambda (name)
|
||||
(test::scm setup-use-keyboxd
|
||||
(qualify (path-join "tests" "openpgp" name)
|
||||
"keyboxd")
|
||||
"keyboxd"
|
||||
(path-join "tests" "openpgp" name)
|
||||
(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)
|
||||
"keyring")
|
||||
"keyring"
|
||||
(path-join "tests" "openpgp" name)
|
||||
(in-srcdir "tests" "openpgp" name)
|
||||
"--use-keyring")) all-tests)
|
||||
)))
|
||||
"--use-keyring")) all-tests))))
|
||||
|
||||
tests)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue