diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-12 22:07:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-13 00:03:46 +0200 |
| commit | e2f9832f454a63884aebd2d8bf85829012b58f1c (patch) | |
| tree | feff9e2b7db4dfe64794d3b943b440f5f8e7a53f /gnu/tests | |
| parent | d5094c81156b587a3403a1881a4952f6d19b2076 (diff) | |
| download | guix-e2f9832f454a63884aebd2d8bf85829012b58f1c.tar guix-e2f9832f454a63884aebd2d8bf85829012b58f1c.tar.gz | |
tests: "basic" test loads (guix …) modules from the right place.
This is a followup to 7561881f2a5d2dc463c24713745eca03e67044bf.
* gnu/tests/base.scm (run-basic-test)["/run/current-system is a GC
root"]: Remove 'set!' statements, add 'add-to-load-path' statement for
GUIX.
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/base.scm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 8fb978dde1..37aab8ef67 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -31,6 +31,7 @@ #:use-module (gnu services networking) #:use-module (gnu packages imagemagick) #:use-module (gnu packages ocr) + #:use-module (gnu packages package-management) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) @@ -300,19 +301,13 @@ info --version") 'success! (marionette-eval '(begin ;; Make sure the (guix …) modules are found. - (eval-when (expand load eval) - (set! %load-path - (cons - (string-append - "/run/current-system/profile/share/guile/site/" - (effective-version)) - %load-path)) - (set! %load-compiled-path - (cons - (string-append - "/run/current-system/profile/share/guile/site/" - (effective-version)) - %load-compiled-path))) + ;; + ;; XXX: Currently shepherd and marionette run + ;; on Guile 2.0 whereas Guix is on 2.2. Yet + ;; we should be able to load the 2.0 Scheme + ;; files since it's pure Scheme. + (add-to-load-path + #+(file-append guix "/share/guile/site/2.2")) (use-modules (srfi srfi-34) (guix store)) |