diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 23:17:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 23:51:39 +0100 |
| commit | bc1ad69605b6c3e2744694758d63dfc216107a82 (patch) | |
| tree | 5eee850233d5f66a9addded1ef6ee3f69e78adc0 /tests/gexp.scm | |
| parent | c334b7c52fe77b68a90b23fbac5c9de7337e607b (diff) | |
| download | guix-bc1ad69605b6c3e2744694758d63dfc216107a82.tar guix-bc1ad69605b6c3e2744694758d63dfc216107a82.tar.gz | |
tests: Pass #:guile to 'computed-file' & co.
Fixes a regression introduced in
af57d1bf6c46f47d82dbc234dde1e16fa8634e9d whereby tests would end up
building the world.
* guix/gexp.scm (mixed-text-file): Add #:guile parameter and honor it.
* tests/gexp.scm ("mixed-text-file"): Pass #:guile to 'mixed-text-file'.
("file-union"): Pass #:guile to 'file-union'.
("lower-object, computed-file"): Pass #:guile to 'computed-file'.
("lower-object, computed-file + grafts"): Likewise.
* tests/packages.scm ("origin->derivation, single file with snippet"):
Likewise.
* tests/profiles.scm ("profile-derivation, ordering & collisions"):
Likewise.
* guix/tests.scm (test-file): Likewise.
Diffstat (limited to 'tests/gexp.scm')
| -rw-r--r-- | tests/gexp.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index ad8e1d57b8..390cf7a207 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. @@ -1413,6 +1413,7 @@ importing.* \\(guix config\\) from the host" (test-assertm "mixed-text-file" (mlet* %store-monad ((file -> (mixed-text-file "mixed" + #:guile %bootstrap-guile "export PATH=" %bootstrap-guile "/bin")) (drv (lower-object file)) @@ -1430,7 +1431,8 @@ importing.* \\(guix config\\) from the host" (mlet* %store-monad ((union -> (file-union "union" `(("a" ,(plain-file "a" "1")) ("b/c/d" ,(plain-file "d" "2")) - ("e" ,(plain-file "e" "3"))))) + ("e" ,(plain-file "e" "3"))) + #:guile %bootstrap-guile)) (drv (lower-object union)) (out -> (derivation->output-path drv))) (define (contents=? file str) @@ -1469,7 +1471,8 @@ importing.* \\(guix config\\) from the host" (symlink #$%bootstrap-guile (string-append #$output "/guile")) (symlink #$text (string-append #$output "/text")))) - (computed (computed-file "computed" exp))) + (computed (computed-file "computed" exp + #:guile %bootstrap-guile))) (mlet* %store-monad ((text (lower-object text)) (guile-drv (lower-object %bootstrap-guile)) (comp-drv (lower-object computed)) @@ -1504,7 +1507,8 @@ importing.* \\(guix config\\) from the host" (display item port)))))) (computed (computed-file "computed" exp #:options - `(#:references-graphs (("graph" ,pkg))))) + `(#:references-graphs (("graph" ,pkg))) + #:guile %bootstrap-guile)) (drv0 (package-derivation %store pkg #:graft? #t)) (drv1 (parameterize ((%graft? #t)) (run-with-store %store |