[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: tests: base: Add Guile-Gcrypt & co. to the search path.
From: |
Ludovic Courtès |
Subject: |
04/04: tests: base: Add Guile-Gcrypt & co. to the search path. |
Date: |
Sat, 8 Sep 2018 17:02:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4ab6a2f23d43f6c7e4a5a7420db613c5ba5b03b6
Author: Ludovic Courtès <address@hidden>
Date: Sat Sep 8 22:59:04 2018 +0200
tests: base: Add Guile-Gcrypt & co. to the search path.
Fixes a regression introduced in
ca719424455465fca4b872c371daf2a46de88b33, whereby (gcrypt hash) would
not be found in the system under test, leading to a failure of the
"/run/current-system is a GC root" test.
* gnu/tests/base.scm (run-basic-test)[guix&co]: New variable.
[test]: Add all of GUIX&CO to %LOAD-PATH.
---
gnu/tests/base.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index f27064a..f97581d 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))