~ruther/guix-local

127ed6a9ddcaaec56e88b717892e74e3840584ef — Ludovic Courtès 12 years ago 0621349
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.
2 files changed, 4 insertions(+), 4 deletions(-)

M tests/packages.scm
M tests/union.scm
M tests/packages.scm => tests/packages.scm +1 -1
@@ 124,7 124,7 @@

(test-equal "package-source-derivation, snippet"
  "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)))
         (sha256 (call-with-input-file file port-sha256))
         (fetch  (lambda* (store url hash-algo hash

M tests/union.scm => tests/union.scm +3 -3
@@ 116,10 116,10 @@
                (directory-exists? "lib/gcc")
                (file-exists? "include/unistd.h")

                ;; The 'include' sub-directory is only found in
                ;; glibc-bootstrap, so it should be unified in a
                ;; The 'include/c++' sub-directory is only found in
                ;; gcc-bootstrap, so it should be unified in a
                ;; 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
                ;; unifying it requires traversing them all, and creating a