aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-11-04 01:11:48 +0100
committerLudovic Courtès <ludo@gnu.org>2023-11-05 23:23:23 +0100
commit0c695bbf8dbd5a5c1224f331a78b6316bc16e4d1 (patch)
tree6a74baace6bbbfa9f603e9cfb1ba0384395513da
parent286639c9af49dc56dce68a5483fd8ca3aeaecdb0 (diff)
downloadguix-0c695bbf8dbd5a5c1224f331a78b6316bc16e4d1.tar.gz
guix-0c695bbf8dbd5a5c1224f331a78b6316bc16e4d1.zip
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.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/tests.scm b/gnu/tests.scm
index 96ecb40ea2..5ff9db82fc 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -33,6 +33,10 @@
#:use-module (gnu services base)
#:use-module (gnu services shepherd)
#:use-module (guix discovery)
+ #:use-module (guix monads)
+ #:use-module ((guix store) #:select (%store-monad))
+ #:use-module ((guix utils)
+ #:select (%current-system %current-target-system))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9 gnu)
#:use-module (ice-9 match)
@@ -284,8 +288,9 @@ the system under test."
(define-gexp-compiler (compile-system-test (test <system-test>)
system target)
"Compile TEST to a derivation."
- ;; XXX: SYSTEM and TARGET are ignored.
- (system-test-value test))
+ (mparameterize %store-monad ((%current-system system)
+ (%current-target-system target))
+ (system-test-value test)))
(define (test-modules)
"Return the list of modules that define system tests."