modified tests/debug-link.scm
@@ -24,6 +24,7 @@ (define-module (test-debug-link)
#:use-module (guix build io)
#:use-module (guix gexp)
#:use-module (guix modules)
+ #:use-module (guix packages)
#:use-module (guix store)
#:use-module (guix tests)
#:use-module (guix monads)
@@ -57,9 +58,7 @@ (define %guile-executable
(string-suffix? ".debug" file)))))
;; Since we need %BOOTSTRAP-GCC and co., we have to skip the following tests
-;; when networking is unreachable because we'd fail to download it. Since
-;; using mmap to load ELF more efficiently, we also need the regular Guile
-;; package, as guile-bootstrap cannot resolve dynamic symbols.
+;; when networking is unreachable because we'd fail to download it.
(with-external-store store
(unless (and (network-reachable?) store) (test-skip 1))
(test-assertm "elf-debuglink"
@@ -99,7 +98,14 @@ (define %guile-executable
debuglink-crc32)))
(write (list file (= crc expected))
port))))))))))
- (mlet* %store-monad ((drv (gexp->derivation "debuglink" exp))
+ (mlet* %store-monad ((guile (set-guile-for-build guile-3.0))
+ (drv (gexp->derivation
+ "debuglink" exp
+ ;; To be able to use mmap, the regular
+ ;; Guile package must be used, as
+ ;; guile-bootstrap cannot resolve dynamic
+ ;; symbols.
+ #:guile-for-build guile))
(x (built-derivations (list drv))))
(call-with-input-file (derivation->output-path drv)
(lambda (port)
@@ -144,7 +150,14 @@ (define %guile-executable
(call-with-output-file #$output
(lambda (port)
(write (list file crc) port)))))))))
- (mlet* %store-monad ((drv (gexp->derivation "debuglink" exp))
+ (mlet* %store-monad ((guile (set-guile-for-build guile-3.0))
+ (drv (gexp->derivation
+ "debuglink" exp
+ ;; To be able to use mmap, the regular
+ ;; Guile package must be used, as
+ ;; guile-bootstrap cannot resolve dynamic
+ ;; symbols.
+ #:guile-for-build guile))
(x (built-derivations (list drv))))
(call-with-input-file (derivation->output-path drv)
(lambda (port)