diff options
| -rwxr-xr-x | build-aux/test-driver.scm | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/build-aux/test-driver.scm b/build-aux/test-driver.scm index 20bd8f095ed..6eb3a863f6a 100755 --- a/build-aux/test-driver.scm +++ b/build-aux/test-driver.scm @@ -3,7 +3,7 @@ exec guile --no-auto-compile -e main -s "$0" "$@" !# ;;;; test-driver.scm - Guile test driver for Automake testsuite harness -(define script-version "2026-03-19.14") ;UTC +(define script-version "2026-03-20.08") ;UTC ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop> @@ -191,9 +191,20 @@ called to do the final reporting." (positive? (test-runner-xpass-count runner)))) (skip (or (positive? (test-runner-skip-count runner)) (positive? (test-runner-xfail-count runner))))) - ;; XXX: The global results need some refinements for XPASS. - (format trs-port ":global-test-result: ~A~%" - (if fail "FAIL" (if skip "SKIP" "PASS"))) + (format trs-port ":test-global-result: ~{~A~^,~}~%" + (filter-map (λ (proc str) + (let ((n (proc runner))) + (if (positive? n) str #f))) + (list test-runner-pass-count + test-runner-fail-count + test-runner-xpass-count + test-runner-xfail-count + test-runner-skip-count) + (list "PASS" + "FAIL" + "XPASS" + "XFAIL" + "SKIP"))) (format trs-port ":recheck: ~A~%" (if fail "yes" "no")) (format trs-port ":copy-in-global-log: ~A~%" |