diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-02-27 23:28:35 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-02-27 23:31:52 +0100 |
commit | f376dc3acb69a7345a7e945a37a78f63ac626edb (patch) | |
tree | 03c9178ef71bf7db808823bbd60a5588512375ff /tests/grafts.scm | |
parent | cd05d388121d6a9d7ee83aefa29d3c3b255b7552 (diff) | |
download | patches-f376dc3acb69a7345a7e945a37a78f63ac626edb.tar patches-f376dc3acb69a7345a7e945a37a78f63ac626edb.tar.gz |
grafts: Consider all the outputs in the graft mapping.
Before that, outputs of a derivation could be left referring to the
ungrafted version of the derivation.
* guix/grafts.scm (graft-derivation)[outputs]: Change to a list of
name/file pairs.
* guix/grafts.scm (graft-derivation)[build]: Add 'old-outputs' variable
and use it when computing 'mapping'. Use 'mapping' directly.
* tests/grafts.scm ("graft-derivation, multiple outputs"): New test.
Diffstat (limited to 'tests/grafts.scm')
-rw-r--r-- | tests/grafts.scm | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/grafts.scm b/tests/grafts.scm index 4a4122a3e9..9fe314d183 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -75,6 +75,26 @@ (string=? (readlink (string-append graft "/sh")) one) (string=? (readlink (string-append graft "/self")) graft)))))) +(test-assert "graft-derivation, multiple outputs" + (let* ((build `(begin + (symlink (assoc-ref %build-inputs "a") + (assoc-ref %outputs "one")) + (symlink (assoc-ref %outputs "one") + (assoc-ref %outputs "two")))) + (orig (build-expression->derivation %store "grafted" build + #:inputs `(("a" ,%bash)) + #:outputs '("one" "two"))) + (repl (add-text-to-store %store "bash" "fake bash")) + (grafted (graft-derivation %store orig + (list (graft + (origin %bash) + (replacement repl)))))) + (and (build-derivations %store (list grafted)) + (let ((one (derivation->output-path grafted "one")) + (two (derivation->output-path grafted "two"))) + (and (string=? (readlink one) repl) + (string=? (readlink two) one)))))) + (test-end) |