diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
| commit | 25d5b708a636ecf779035f75ad110574fc0262b9 (patch) | |
| tree | 7d8429a59b7523d79790c5f4cdb5b96fabe8494e /tests/store.scm | |
| parent | 17287d7d47567aa1649250182e0f7ab11d5d55d1 (diff) | |
| parent | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (diff) | |
| download | patches-25d5b708a636ecf779035f75ad110574fc0262b9.tar patches-25d5b708a636ecf779035f75ad110574fc0262b9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/store.scm')
| -rw-r--r-- | tests/store.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/store.scm b/tests/store.scm index 9ed78be085..f778c2086d 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -367,15 +367,15 @@ (with-store s (let* ((d (package-derivation s %bootstrap-guile (%current-system))) (o (derivation->output-path d))) - ;; Create fake substituter data, to be read by `substitute-binary'. + ;; Create fake substituter data, to be read by 'guix substitute'. (with-derivation-narinfo d ;; Remove entry from the local cache. (false-if-exception (delete-file (string-append (getenv "XDG_CACHE_HOME") - "/guix/substitute-binary/" + "/guix/substitute/" (store-path-hash-part o)))) - ;; Make sure `substitute-binary' correctly communicates the above + ;; Make sure 'guix substitute' correctly communicates the above ;; data. (set-build-options s #:use-substitutes? #t) (and (has-substitutes? s o) @@ -439,7 +439,7 @@ (with-derivation-substitute d c (sha256 => (make-bytevector 32 0)) ;select a hash that doesn't match C - ;; Make sure we use `substitute-binary'. + ;; Make sure we use 'guix substitute'. (set-build-options s #:use-substitutes? #t #:fallback? #f) @@ -464,9 +464,9 @@ #:guile-for-build (package-derivation s %bootstrap-guile (%current-system)))) (o (derivation->output-path d))) - ;; Create fake substituter data, to be read by `substitute-binary'. + ;; Create fake substituter data, to be read by 'guix substitute'. (with-derivation-narinfo d - ;; Make sure we use `substitute-binary'. + ;; Make sure we use 'guix substitute'. (set-build-options s #:use-substitutes? #t) (and (has-substitutes? s o) (guard (c ((nix-protocol-error? c) |