summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-22 22:54:04 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-22 23:04:05 +0100
commit5f2daffe096de707a120ae3e6396e9244c366930 (patch)
treea16fb50c4afcbffe51a2f0d69c042df7685b2d1d /guix
parent02ec889e6b8f6593dd90afcb4d60a43ea67be4b8 (diff)
self: System tests depend on CLI modules.
This is because (gnu tests docker) depends on (guix scripts pack). * guix/self.scm (compiled-guix)[*system-test-modules*]: Add dependency on *CLI-MODULES*.
Diffstat (limited to 'guix')
-rw-r--r--guix/self.scm21
1 files changed, 11 insertions, 10 deletions
diff --git a/guix/self.scm b/guix/self.scm
index fea5db5da3..d1b8256802 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -621,16 +621,6 @@ 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")
@@ -641,6 +631,17 @@ Info manual."
#:extensions dependencies
#:guile-for-build guile-for-build))
+ (define *system-test-modules*
+ ;; Ship these modules mostly so (gnu ci) can discover 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*
+ *cli-modules*) ;for (guix scripts pack), etc.
+ #:extensions dependencies
+ #:guile-for-build guile-for-build))
+
(define *config*
(scheme-node "guix-config"
'()