diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
| commit | 5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580 (patch) | |
| tree | 9f4ce853b9bc2d2b5433d8f0bec18749e93d8ba3 /guix/self.scm | |
| parent | 38f77be464b0b6ca76105d5f0a1b5e55fd694036 (diff) | |
| parent | 6a6799b27af8646da112d51bedb8e5ff6158e425 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/guix/self.scm b/guix/self.scm index fa78015a41..d1b8256802 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -36,8 +36,7 @@ #:export (make-config.scm whole-package ;for internal use in 'guix pull' compiled-guix - guix-derivation - reload-guix)) + guix-derivation)) ;;; @@ -613,10 +612,6 @@ Info manual." (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)) @@ -636,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" '() @@ -664,6 +670,7 @@ Info manual." ;; comes with *CORE-MODULES*. (list *config* *cli-modules* + *system-test-modules* *system-modules* *package-modules* *core-package-modules* |