diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-31 11:06:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-06-02 18:47:06 +0200 |
| commit | 2dc98729afb62e48b5866f599df9a9274d440686 (patch) | |
| tree | a72a66bb34e6bb309bf93dfc89523a63b5685b41 /tests | |
| parent | ef51ac21eec28de3b0fb693f88be5f3c494d464a (diff) | |
| download | guix-2dc98729afb62e48b5866f599df9a9274d440686.tar.gz | |
derivations: 'derivation-prerequisites-to-build' returns <substitutable>.
* guix/derivations.scm (derivation-prerequisites-to-build): Rename
#:substitutable? to #:substitutable-info.
[derivation-substitutable?]: Rename to...
[derivation-substitutable-info]: ... this. Return a list of <substitutable>.
Second return value is now a list of <substitutable> instead of a list
of strings.
* guix/ui.scm (show-what-to-build)[substitutable?]: Rename to...
[substitutable-info]: ... this.
Adjust to new 'derivation-prerequisites-to-build' return value type.
* tests/derivations.scm ("derivation-prerequisites-to-build and
substitutes"): Adjust.
("derivation-prerequisites-to-build and substitutes, local build"):
Likewise.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/derivations.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index d4e1a32bb6..f3aad1b906 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -831,10 +831,10 @@ (derivation-prerequisites-to-build store drv)) ((build* download*) (derivation-prerequisites-to-build store drv - #:substitutable? + #:substitutable-info (const #f)))) (and (null? build) - (equal? download (list output)) + (equal? (map substitutable-path download) (list output)) (null? download*) (null? build*)))))) @@ -879,7 +879,7 @@ ;; See <http://bugs.gnu.org/18747>. (and (null? build) (match download - (((? string? item)) + (((= substitutable-path item)) (string=? item (derivation->output-path drv)))))))))) (test-assert "derivation-prerequisites-to-build in 'check' mode" |