From ba2f2085a95be47a06ac6ba75a4c7def7c6599b2 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 26 Apr 2022 12:54:07 +0900 Subject: [PATCH] tests: Support single invocation with variant. * tests/openpgp/run-tests.scm: Add GPGSCM_TEST_VARIANT support. -- Signed-off-by: NIIBE Yutaka --- tests/openpgp/run-tests.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm index d4914bda7..76432b736 100644 --- a/tests/openpgp/run-tests.scm +++ b/tests/openpgp/run-tests.scm @@ -32,11 +32,33 @@ (path-join "tests" "openpgp" "setup.scm") (in-srcdir "tests" "openpgp" "setup.scm")))) +(define (qualify path variant) + (string-append "<" variant ">" path)) + +(define (setup* variant) + (make-environment-cache + (test::scm + #f + (qualify (path-join "tests" "openpgp" "setup.scm") variant) + (in-srcdir "tests" "openpgp" "setup.scm") + (string-append "--" variant)))) + +(define setup-use-keyboxd (setup* "use-keyboxd")) +(define use-keyboxd? (or (string=? "--use-keyboxd" (car *args*)) + (string=? "keyboxd" (getenv "GPGSCM_TEST_VARIANT")))) + (define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*)) (run-tests (if (null? tests) (load-tests "tests" "openpgp") - (map (lambda (name) - (test::scm setup - (path-join "tests" "openpgp" name) - (in-srcdir "tests" "openpgp" name))) tests))) + (if use-keyboxd? + (map (lambda (name) + (test::scm setup-use-keyboxd + (qualify (path-join "tests" "openpgp" name) + "keyboxd") + (in-srcdir "tests" "openpgp" name) + "--use-keyboxd")) tests) + (map (lambda (name) + (test::scm setup + (path-join "tests" "openpgp" name) + (in-srcdir "tests" "openpgp" name))) tests))))