nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: "basic" test loads (guix …) modules from the right place. 

This is a followup to 7561881f2a.

* 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.
master
Ludovic Courtès 2017-05-12 22:07:52 +02:00
parent d5094c8115
commit e2f9832f45
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/tests/base.scm
View File

@ -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))