From 67d84d6335ae84ac7c217061570e6b968060073c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 May 2017 11:43:01 +0200 Subject: tests: Use 'fold-module-public-variables' for discovery. * gnu/tests.scm (fold-system-tests): Write in terms of 'fold-module-public-variables'. --- gnu/tests.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/tests.scm b/gnu/tests.scm index 0df6e5a2ef..810711ab91 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -27,7 +27,7 @@ (define-module (gnu tests) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services shepherd) - #:use-module ((guix discovery) #:select (scheme-modules)) + #:use-module (guix discovery) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu) #:use-module (ice-9 match) @@ -263,17 +263,12 @@ (define (test-modules) (define (fold-system-tests proc seed) "Invoke PROC on each system test, passing it the test and the previous result." - (fold (lambda (module result) - (fold (lambda (thing result) - (if (system-test? thing) - (proc thing result) - result)) - result - (module-map (lambda (sym var) - (false-if-exception (variable-ref var))) - module))) - '() - (test-modules))) + (fold-module-public-variables (lambda (obj result) + (if (system-test? obj) + (cons obj result) + result)) + '() + (test-modules))) (define (all-system-tests) "Return the list of system tests." -- cgit v1.2.3