mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
tests: Enable tests with keyboxd only when it's configured.
* tests/gpgscm/tests.scm (in-objdir): Move from... * g13/all-tests.scm: ... here. * tests/openpgp/all-tests.scm (keyboxd-enabled?): New. (tests): Enable when keyboxd-enabled?. -- GnuPG-bug-id: 5966 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
3d7d7e8bfd
commit
09df630e4b
3 changed files with 20 additions and 12 deletions
|
@ -52,6 +52,13 @@
|
|||
(lambda (filename port key) (parse-makefile port key))
|
||||
"XTESTS"))
|
||||
|
||||
(define keyboxd-enabled?
|
||||
;; Parse the variable "libexec_PROGRAMS" in kbx/Makefile
|
||||
(not (null?
|
||||
(parse-makefile-expand (in-objdir "kbx" "Makefile")
|
||||
(lambda (filename port key) (parse-makefile port key))
|
||||
"libexec_PROGRAMS"))))
|
||||
|
||||
(define tests
|
||||
(map (lambda (name)
|
||||
(test::scm setup
|
||||
|
@ -62,20 +69,21 @@
|
|||
(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
|
||||
;; The second pass uses the keyboxd
|
||||
(if keyboxd-enabled?
|
||||
(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)
|
||||
"keyring")
|
||||
(in-srcdir "tests" "openpgp" name)
|
||||
"--use-keyring")) all-tests)
|
||||
)))
|
||||
)))
|
||||
|
||||
tests)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue