From cca91a3f8f7e3e36b7149fc93f7b6df11d21eb1d Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 9 Mar 2017 13:26:06 +0100 Subject: tests: Rework environment setup. * tests/gpgscm/tests.scm (test::scm): Add a setup argument. (test::binary): Likewise. (run-tests-parallel): Remove setup parameter. (run-tests-sequential): Likewise. (make-environment-cache): New function that handles the cache protocol. * tests/gpgme/run-tests.scm: Adapt accordingly. * tests/gpgsm/run-tests.scm: Likewise. * tests/migrations/run-tests.scm: Likewise. * tests/openpgp/run-tests.scm: Likewise. -- This change allows us to have different environments for tests. This is needed to run more GPGME tests, and to increase concurrency while running all tests. Signed-off-by: Justus Winter --- tests/gpgsm/run-tests.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/gpgsm') diff --git a/tests/gpgsm/run-tests.scm b/tests/gpgsm/run-tests.scm index dfd5b0266..e44424513 100644 --- a/tests/gpgsm/run-tests.scm +++ b/tests/gpgsm/run-tests.scm @@ -20,13 +20,13 @@ (if (string=? "" (getenv "srcdir")) (begin (echo "Environment variable 'srcdir' not set. Please point it to" - "tests/openpgp.") + "tests/gpgsm.") (exit 2))) (let* ((tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*)) + (setup (make-environment-cache (test::scm #f "setup.scm" "setup.scm"))) (runner (if (and (member "--parallel" *args*) (> (length tests) 1)) run-tests-parallel run-tests-sequential))) - (runner (test::scm "setup.scm" "setup.scm") - (map (lambda (t) (test::scm t t)) tests))) + (runner (map (lambda (t) (test::scm setup t t)) tests))) -- cgit v1.2.3