[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: tests: Do not assume the bootstrap guile tarball is available loc
From: |
Ludovic Courtès |
Subject: |
01/04: tests: Do not assume the bootstrap guile tarball is available locally. |
Date: |
Thu, 15 Mar 2018 06:40:00 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f8ec8d96d657f95e71e0798124cdeb2c9217c7fa
Author: Ludovic Courtès <address@hidden>
Date: Thu Mar 15 10:25:10 2018 +0100
tests: Do not assume the bootstrap guile tarball is available locally.
Fixes <https://bugs.gnu.org/30824>.
Reported by Chris Marusich <address@hidden>.
* tests/packages.scm ("package-source-derivation, snippet"): Use
'bootstrap-guile-origin' instead of assuming the bootstrap guile tarball
is available locally.
---
tests/packages.scm | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/tests/packages.scm b/tests/packages.scm
index b2fa21a..9e19c39 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -377,24 +377,9 @@
(unless (network-reachable?) (test-skip 1))
(test-equal "package-source-derivation, snippet"
"OK"
- (let* ((file (search-bootstrap-binary (match (%current-system)
- ("armhf-linux"
- "guile-2.0.11.tar.xz")
- ("aarch64-linux"
- "guile-2.0.14.tar.xz")
- (_
- "guile-2.0.9.tar.xz"))
- (%current-system)))
- (sha256 (call-with-input-file file port-sha256))
- (fetch (lambda* (url hash-algo hash
- #:optional name #:key system)
- (pk 'fetch url hash-algo hash name system)
- (interned-file url)))
- (source (bootstrap-origin
+ (let* ((source (bootstrap-origin
(origin
- (method fetch)
- (uri file)
- (sha256 sha256)
+ (inherit (bootstrap-guile-origin (%current-system)))
(patch-inputs
`(("tar" ,%bootstrap-coreutils&co)
("xz" ,%bootstrap-coreutils&co)