diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-11-04 01:11:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-11-05 23:23:23 +0100 |
| commit | 0c695bbf8dbd5a5c1224f331a78b6316bc16e4d1 (patch) | |
| tree | 6a74baace6bbbfa9f603e9cfb1ba0384395513da | |
| parent | 286639c9af49dc56dce68a5483fd8ca3aeaecdb0 (diff) | |
tests: Honor system and target when lowering <system-test>.
* gnu/tests.scm (compile-system-test): Wrap ‘system-test-value’ call in
‘mparameterize’.
Change-Id: I4be28913a86f43059b0886ad2fcf81a9c699b730
| -rw-r--r-- | gnu/tests.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/tests.scm b/gnu/tests.scm index 96ecb40ea23..5ff9db82fce 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm | |||
| @@ -33,6 +33,10 @@ | |||
| 33 | #:use-module (gnu services base) | 33 | #:use-module (gnu services base) |
| 34 | #:use-module (gnu services shepherd) | 34 | #:use-module (gnu services shepherd) |
| 35 | #:use-module (guix discovery) | 35 | #:use-module (guix discovery) |
| 36 | #:use-module (guix monads) | ||
| 37 | #:use-module ((guix store) #:select (%store-monad)) | ||
| 38 | #:use-module ((guix utils) | ||
| 39 | #:select (%current-system %current-target-system)) | ||
| 36 | #:use-module (srfi srfi-1) | 40 | #:use-module (srfi srfi-1) |
| 37 | #:use-module (srfi srfi-9 gnu) | 41 | #:use-module (srfi srfi-9 gnu) |
| 38 | #:use-module (ice-9 match) | 42 | #:use-module (ice-9 match) |
| @@ -284,8 +288,9 @@ the system under test." | |||
| 284 | (define-gexp-compiler (compile-system-test (test <system-test>) | 288 | (define-gexp-compiler (compile-system-test (test <system-test>) |
| 285 | system target) | 289 | system target) |
| 286 | "Compile TEST to a derivation." | 290 | "Compile TEST to a derivation." |
| 287 | ;; XXX: SYSTEM and TARGET are ignored. | 291 | (mparameterize %store-monad ((%current-system system) |
| 288 | (system-test-value test)) | 292 | (%current-target-system target)) |
| 293 | (system-test-value test))) | ||
| 289 | 294 | ||
| 290 | (define (test-modules) | 295 | (define (test-modules) |
| 291 | "Return the list of modules that define system tests." | 296 | "Return the list of modules that define system tests." |
