ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
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 @@ (define-module (gnu tests base)
#:use-module (gnu services networking) #:use-module (gnu services networking)
#:use-module (gnu packages imagemagick) #:use-module (gnu packages imagemagick)
#:use-module (gnu packages ocr) #:use-module (gnu packages ocr)
#:use-module (gnu packages package-management)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix monads) #:use-module (guix monads)
@ -300,19 +301,13 @@ (define (entry->list entry)
'success! 'success!
(marionette-eval '(begin (marionette-eval '(begin
;; Make sure the (guix …) modules are found. ;; Make sure the (guix …) modules are found.
(eval-when (expand load eval) ;;
(set! %load-path ;; XXX: Currently shepherd and marionette run
(cons ;; on Guile 2.0 whereas Guix is on 2.2. Yet
(string-append ;; we should be able to load the 2.0 Scheme
"/run/current-system/profile/share/guile/site/" ;; files since it's pure Scheme.
(effective-version)) (add-to-load-path
%load-path)) #+(file-append guix "/share/guile/site/2.2"))
(set! %load-compiled-path
(cons
(string-append
"/run/current-system/profile/share/guile/site/"
(effective-version))
%load-compiled-path)))
(use-modules (srfi srfi-34) (guix store)) (use-modules (srfi srfi-34) (guix store))