From c274b5c2b2b42cb10053973b1091fb7e431e81eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 19 Mar 2026 22:17:16 +0900 Subject: [PATCH] build-aux: Streamline test-driver.scm a bit. Guile 3.0.11 ships with a new SRFI 64. * build-aux/test-driver.scm (%test-match-all): Delete procedure. (main): Replace %test-match-all with test-match-all. Change-Id: Ibcd7d98194694c1de679491be4f5a603a79f6e29 --- build-aux/test-driver.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/build-aux/test-driver.scm b/build-aux/test-driver.scm index 7c0c403f7a..612529db35 100755 --- a/build-aux/test-driver.scm +++ b/build-aux/test-driver.scm @@ -213,20 +213,6 @@ cases based on their names." (lambda (runner) (not (string-match regexp (test-runner-test-name runner))))) -;;; XXX: test-match-all is a syntax, which isn't convenient to use with a list -;;; of test specifiers computed at run time. Copy this SRFI 64 internal -;;; definition here, which is the procedural equivalent of 'test-match-all'. -(define (%test-match-all . pred-list) - (lambda (runner) - (let ((result #t)) - (let loop ((l pred-list)) - (if (null? l) - result - (begin - (if (not ((car l) runner)) - (set! result #f)) - (loop (cdr l)))))))) - ;;; ;;; Entry point. @@ -249,7 +235,7 @@ cases based on their names." identity (list (and=> select test-match-name*) (and=> exclude test-match-name*/negated)))) - (test-specifier (apply %test-match-all test-specifiers)) + (test-specifier (apply test-match-all test-specifiers)) (color-tests (if (assoc 'color-tests opts) (option->boolean opts 'color-tests) #t)))