diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-16 22:10:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-16 22:10:03 +0100 |
| commit | 127ed6a9ddcaaec56e88b717892e74e3840584ef (patch) | |
| tree | c5dcec61e661a49ccf9cb11633b1acbd4d9ad57f | |
| parent | 062134985802d85066418f6ee2f327122166a567 (diff) | |
| download | guix-127ed6a9ddcaaec56e88b717892e74e3840584ef.tar.gz guix-127ed6a9ddcaaec56e88b717892e74e3840584ef.zip | |
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.
| -rw-r--r-- | tests/packages.scm | 2 | ||||
| -rw-r--r-- | tests/union.scm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 803cabb061..8d0d205f54 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -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 diff --git a/tests/union.scm b/tests/union.scm index cb110c3b1e..54e2850942 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -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 |