diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
| commit | 61b1df6f2791a2afa291b56708d73a5264ca70eb (patch) | |
| tree | 314ddb96391b25e83e9a31637be0f1a7f52cc249 /gnu/tests.scm | |
| parent | bdb8267680f14ee5d3df9d029f23279c1457c211 (diff) | |
| parent | 4be014128e1c422f37b56f9a6b3420b4e85c4302 (diff) | |
| download | guix-61b1df6f2791a2afa291b56708d73a5264ca70eb.tar guix-61b1df6f2791a2afa291b56708d73a5264ca70eb.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/tests.scm')
| -rw-r--r-- | gnu/tests.scm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gnu/tests.scm b/gnu/tests.scm index e84d1ebb20..810711ab91 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -27,7 +27,7 @@ #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services shepherd) - #:use-module ((gnu packages) #: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 @@ the system under test." (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." |