~ruther/guix-local

e2f9832f454a63884aebd2d8bf85829012b58f1c — Ludovic Courtès 8 years ago d5094c8 
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.
patch browse .tar.gz 
1 files changed, 8 insertions(+), 13 deletions(-)

M gnu/tests/base.scm

M gnu/tests/base.scm => gnu/tests/base.scm +8 -13
@@ 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))