diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-09 17:40:35 +0200 |
| commit | 0aeb13485055975d71ec8283040f007c79599bba (patch) | |
| tree | a06139136c809b00d166d6d66bdf757f20566704 /gnu/tests/base.scm | |
| parent | b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 (diff) | |
| parent | 0084744b3af0a6f8e125120143f57567902339a8 (diff) | |
| download | guix-0aeb13485055975d71ec8283040f007c79599bba.tar guix-0aeb13485055975d71ec8283040f007c79599bba.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/tests/base.scm')
| -rw-r--r-- | gnu/tests/base.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index f27064af85..f97581de33 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -42,6 +42,7 @@ #:use-module (guix monads) #:use-module (guix packages) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (run-basic-test %test-basic-os %test-halt @@ -68,6 +69,11 @@ initialization step, such as entering a LUKS passphrase." (fold-services (operating-system-services os) #:target-type special-files-service-type))) + (define guix&co + (match (package-transitive-propagated-inputs guix) + (((labels packages) ...) + (cons guix packages)))) + (define test (with-imported-modules '((gnu build marionette) (guix build syscalls)) @@ -345,8 +351,14 @@ info --version") 'success! (marionette-eval '(begin ;; Make sure the (guix …) modules are found. - (add-to-load-path - #+(file-append guix "/share/guile/site/2.2")) + (eval-when (expand load eval) + (set! %load-path + (append (map (lambda (package) + (string-append package + "/share/guile/site/" + (effective-version))) + '#$guix&co) + %load-path))) (use-modules (srfi srfi-34) (guix store)) |