[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: self: Build the (gnu tests …) modules.
From: |
guix-commits |
Subject: |
01/02: self: Build the (gnu tests …) modules. |
Date: |
Sun, 20 Jan 2019 17:55:04 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 54800977d9e234fa92f927496ca9f9e6ec050aca
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 20 22:59:28 2019 +0100
self: Build the (gnu tests …) modules.
* guix/self.scm (compiled-guix)[*system-modules*]: Remove gnu/tests/*
from #:extra-files.
[*system-test-modules*]: New variable.
[build-modules]: Add them.
---
guix/self.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index fa78015..f367954 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*