diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/openpgp/run-tests.scm | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm index 0cee55908..ce0217b79 100644 --- a/tests/openpgp/run-tests.scm +++ b/tests/openpgp/run-tests.scm @@ -109,49 +109,40 @@ (define (report) (echo (string-append (status retcode) ":") name)))))) -(define (run-tests-parallel setup teardown . tests) +(define (run-tests-parallel setup tests) (lettmp (gpghome-tar) (setup::run-sync '--create-tarball gpghome-tar) (let loop ((pool (test-pool::new '())) (tests' tests)) (if (null? tests') (let ((results (pool::wait))) (for-each (lambda (t) - (let ((teardown' (teardown::set-directory - t::directory))) - (teardown'::run-sync-quiet)) (unlink-recursively t::directory) (t::report)) results::procs) (exit (results::report))) (let* ((wd (mkdtemp)) (test (car tests')) - (test' (test::set-directory wd)) - (setup' (setup::set-directory wd))) - (setup'::run-sync-quiet '--unpack-tarball gpghome-tar) - (loop (pool::add (test'::run-async)) (cdr tests'))))))) + (test' (test::set-directory wd))) + (loop (pool::add (test'::run-async '--unpack-tarball gpghome-tar)) + (cdr tests'))))))) -(define (run-tests-sequential setup teardown . tests) +(define (run-tests-sequential setup tests) (lettmp (gpghome-tar) (setup::run-sync '--create-tarball gpghome-tar) (let loop ((pool (test-pool::new '())) (tests' tests)) (if (null? tests') (let ((results (pool::wait))) (for-each (lambda (t) - (let ((teardown' (teardown::set-directory - t::directory))) - (teardown'::run-sync-quiet)) (unlink-recursively t::directory)) results::procs) (exit (results::report))) (let* ((wd (mkdtemp)) (test (car tests')) - (test' (test::set-directory wd)) - (setup' (setup::set-directory wd))) - (setup'::run-sync-quiet '--unpack-tarball gpghome-tar) - (loop (pool::add (test'::run-sync)) (cdr tests'))))))) + (test' (test::set-directory wd))) + (loop (pool::add (test'::run-sync '--unpack-tarball gpghome-tar)) + (cdr tests'))))))) (let* ((runner (if (member "--parallel" *args*) run-tests-parallel run-tests-sequential)) (tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))) - (apply runner (append (list (test::scm "setup.scm") (test::scm "finish.scm")) - (map test::scm tests)))) + (runner (test::scm "setup.scm") (map test::scm tests))) |