me
/
guix
Archived
1
0
Fork 0
Code

tests: Adjust to bootstrap tarball updates. 

Reported by Mark H. Weaver <mhw@netris.org>.

* tests/packages.scm ("package-source-derivation, snippet"): Change to
  "guile-2.0.9.tar.xz".
* tests/union.scm ("union-build"): Check or include/c++ being a symlink.
master
Ludovic Courtès 2013-11-16 22:10:03 +01:00
parent 0621349858
commit 127ed6a9dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/packages.scm
View File

@ -124,7 +124,7 @@
(test-equal "package-source-derivation, snippet" (test-equal "package-source-derivation, snippet"
"OK" "OK"
(let* ((file (search-bootstrap-binary "guile-2.0.7.tar.xz" (let* ((file (search-bootstrap-binary "guile-2.0.9.tar.xz"
(%current-system))) (%current-system)))
(sha256 (call-with-input-file file port-sha256)) (sha256 (call-with-input-file file port-sha256))
(fetch (lambda* (store url hash-algo hash (fetch (lambda* (store url hash-algo hash

6
tests/union.scm
View File

@ -116,10 +116,10 @@
(directory-exists? "lib/gcc") (directory-exists? "lib/gcc")
(file-exists? "include/unistd.h") (file-exists? "include/unistd.h")
;; The 'include' sub-directory is only found in ;; The 'include/c++' sub-directory is only found in
;; glibc-bootstrap, so it should be unified in a ;; gcc-bootstrap, so it should be unified in a
;; straightforward way, without traversing it. ;; straightforward way, without traversing it.
(eq? 'symlink (stat:type (lstat "include"))) (eq? 'symlink (stat:type (lstat "include/c++")))
;; Conversely, several inputs have a 'bin' sub-directory, so ;; Conversely, several inputs have a 'bin' sub-directory, so
;; unifying it requires traversing them all, and creating a ;; unifying it requires traversing them all, and creating a