aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/self.scm15
1 files changed, 11 insertions, 4 deletions
diff --git a/guix/self.scm b/guix/self.scm
index fa78015a41..f3679546f6 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -613,10 +613,6 @@ Info manual."
(append (file-imports source "gnu/system/examples"
(const #t))
- ;; Need so we get access system tests from an
- ;; inferior.
- (file-imports source "gnu/tests" (const #t))
-
;; All the installer code is on the build-side.
(file-imports source "gnu/installer/"
(const #t))
@@ -626,6 +622,16 @@ Info manual."
#:guile-for-build
guile-for-build))
+ (define *system-test-modules*
+ ;; Ship these modules mostly so (gnu ci) can refer to them.
+ (scheme-node "guix-system-tests"
+ `((gnu tests)
+ ,@(scheme-modules* source "gnu/tests"))
+ (list *core-package-modules* *package-modules*
+ *extra-modules* *system-modules* *core-modules*)
+ #:extensions dependencies
+ #:guile-for-build guile-for-build))
+
(define *cli-modules*
(scheme-node "guix-cli"
(append (scheme-modules* source "/guix/scripts")
@@ -664,6 +670,7 @@ Info manual."
;; comes with *CORE-MODULES*.
(list *config*
*cli-modules*
+ *system-test-modules*
*system-modules*
*package-modules*
*core-package-modules*