mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
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.
This commit is contained in:
parent
8e3e51df11
commit
54800977d9
1 changed files with 11 additions and 4 deletions
|
@ -613,10 +613,6 @@ (define *system-modules*
|
|||
(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 @@ (define *system-modules*
|
|||
#: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 @@ (define (built-modules node-subset)
|
|||
;; comes with *CORE-MODULES*.
|
||||
(list *config*
|
||||
*cli-modules*
|
||||
*system-test-modules*
|
||||
*system-modules*
|
||||
*package-modules*
|
||||
*core-package-modules*
|
||||
|
|
Loading…
Reference in a new issue