ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

self: Build the (gnu tests …) modules.

Browse source 
* 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:
Ludovic Courtès 2019-01-20 22:59:28 +01:00
parent 8e3e51df11
commit 54800977d9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix/self.scm
View file

@ -613,10 +613,6 @@ (define *system-modules*
(append (file-imports source "gnu/system/examples" (append (file-imports source "gnu/system/examples"
(const #t)) (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. ;; All the installer code is on the build-side.
(file-imports source "gnu/installer/" (file-imports source "gnu/installer/"
(const #t)) (const #t))
@ -626,6 +622,16 @@ (define *system-modules*
#:guile-for-build #:guile-for-build
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* (define *cli-modules*
(scheme-node "guix-cli" (scheme-node "guix-cli"
(append (scheme-modules* source "/guix/scripts") (append (scheme-modules* source "/guix/scripts")
@ -664,6 +670,7 @@ (define (built-modules node-subset)
;; comes with *CORE-MODULES*. ;; comes with *CORE-MODULES*.
(list *config* (list *config*
*cli-modules* *cli-modules*
*system-test-modules*
*system-modules* *system-modules*
*package-modules* *package-modules*
*core-package-modules* *core-package-modules*