[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: self: System tests depend on CLI modules.
From: |
guix-commits |
Subject: |
07/11: self: System tests depend on CLI modules. |
Date: |
Tue, 22 Jan 2019 17:05:11 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 5f2daffe096de707a120ae3e6396e9244c366930
Author: Ludovic Courtès <address@hidden>
Date: Tue Jan 22 22:54:04 2019 +0100
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*.
---
guix/self.scm | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/guix/self.scm b/guix/self.scm
index fea5db5..d1b8256 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"
'()
- branch master updated (d1dfcc7 -> ce6236f), guix-commits, 2019/01/22
- 02/11: self: Remove leftover export., guix-commits, 2019/01/22
- 04/11: compile: Let compiler warnings through during the load phase., guix-commits, 2019/01/22
- 03/11: gnu: Remove duplicate record fields., guix-commits, 2019/01/22
- 01/11: vm: Remove unnecessary import., guix-commits, 2019/01/22
- 05/11: records: Detect duplicate field initializers., guix-commits, 2019/01/22
- 07/11: self: System tests depend on CLI modules.,
guix-commits <=
- 06/11: offload: 'status' reports the time difference., guix-commits, 2019/01/22
- 11/11: doc: Move "Package Modules" under "Programming Interface"., guix-commits, 2019/01/22
- 08/11: doc: Move sections under "GNU Distribution" one level higher., guix-commits, 2019/01/22
- 10/11: doc: Move "Packaging Guidelines" under "Contributing"., guix-commits, 2019/01/22
- 09/11: doc: Move "System Installation" right after "Installation"., guix-commits, 2019/01/22