mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
linux-container: 'eval/container' correctly passes -L and -C flags.
This fixes a type error. * gnu/system/linux-container.scm (eval/container): Use 'append-map', not 'map'. * tests/containers.scm ("eval/container, non-empty load path"): New test.
This commit is contained in:
parent
f9c0400392
commit
96b35998e6
2 changed files with 34 additions and 5 deletions
|
@ -257,11 +257,13 @@ (define items
|
|||
(lowered-gexp-guile lowered))
|
||||
"/bin/guile")
|
||||
"guile"
|
||||
(append (map (lambda (directory) `("-L" ,directory))
|
||||
(lowered-gexp-load-path lowered))
|
||||
(map (lambda (directory) `("-C" ,directory))
|
||||
(lowered-gexp-load-compiled-path
|
||||
lowered))
|
||||
(append (append-map (lambda (directory)
|
||||
`("-L" ,directory))
|
||||
(lowered-gexp-load-path lowered))
|
||||
(append-map (lambda (directory)
|
||||
`("-C" ,directory))
|
||||
(lowered-gexp-load-compiled-path
|
||||
lowered))
|
||||
(list "-c"
|
||||
(object->string
|
||||
(lowered-gexp-sexp lowered))))))))))))
|
||||
|
|
|
@ -269,4 +269,31 @@ (define requisites*
|
|||
(lset= string=? (cons* "." ".." (map basename reqs))
|
||||
(pk (call-with-input-file result read))))))))))
|
||||
|
||||
(test-assert "eval/container, non-empty load path"
|
||||
(call-with-temporary-directory
|
||||
(lambda (directory)
|
||||
(define store
|
||||
(open-connection-for-tests))
|
||||
(define result
|
||||
(string-append directory "/r"))
|
||||
(define requisites*
|
||||
(store-lift requisites))
|
||||
|
||||
(mkdir result)
|
||||
(run-with-store store
|
||||
(mlet %store-monad ((status (eval/container
|
||||
(with-imported-modules '((guix build utils))
|
||||
#~(begin
|
||||
(use-modules (guix build utils))
|
||||
(mkdir-p "/result/a/b/c")))
|
||||
#:mappings
|
||||
(list (file-system-mapping
|
||||
(source result)
|
||||
(target "/result")
|
||||
(writable? #t))))))
|
||||
(close-connection store)
|
||||
(return (and (zero? status)
|
||||
(file-is-directory?
|
||||
(string-append result "/a/b/c")))))))))
|
||||
|
||||
(test-end)
|
||||
|
|
Loading…
Reference in a new issue