From 5f2daffe096de707a120ae3e6396e9244c366930 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Jan 2019 22:54:04 +0100 Subject: 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(-) (limited to 'guix') 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" '() -- cgit v1.2.3