From d43dabf4607d3bcfc217eb9aea34d093f5aa698f Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 17 Nov 2016 11:06:42 +0100 Subject: gpgscm: Generalize the test runner. * tests/gpgscm/tests.scm (test::scm) Add explicit name argument. (test::binary): Likewise. Also, add missing unquote. * tests/openpgp/run-tests.scm: Adapt accordingly. Signed-off-by: Justus Winter --- tests/gpgscm/tests.scm | 17 +++++++++-------- tests/openpgp/run-tests.scm | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm index dd4c69fbf..b5df9b7b4 100644 --- a/tests/gpgscm/tests.scm +++ b/tests/gpgscm/tests.scm @@ -553,18 +553,19 @@ ;; A single test. (define test (package - (define (scm path . args) + (define (scm name path . args) ;; Start the process. - (define (spawn-scm args in out err) + (define (spawn-scm args' in out err) (spawn-process-fd `(,*argv0* ,@(verbosity (*verbose*)) - ,(locate-test path) ,@args) in out err)) - (new (basename path) #f spawn-scm #f #f CLOSED_FD)) + ,(locate-test path) + ,@args' ,@args) in out err)) + (new name #f spawn-scm #f #f CLOSED_FD)) - (define (binary path . args) + (define (binary name path . args) ;; Start the process. - (define (spawn-binary args in out err) - (spawn-process-fd `(path ,@args) in out err)) - (new (basename path) #f spawn-binary #f #f CLOSED_FD)) + (define (spawn-binary args' in out err) + (spawn-process-fd `(,path ,@args' ,@args) in out err)) + (new name #f spawn-binary #f #f CLOSED_FD)) (define (new name directory spawn pid retcode logfd) (package diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm index a7c282e5e..414641199 100644 --- a/tests/openpgp/run-tests.scm +++ b/tests/openpgp/run-tests.scm @@ -30,4 +30,5 @@ run-tests-parallel run-tests-sequential)) (tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))) - (runner (test::scm "setup.scm") (map test::scm tests))) + (runner (test::scm "setup.scm" "setup.scm") + (map (lambda (t) (test::scm t t)) tests))) -- cgit v1.2.3