diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-26 15:14:53 +0200 |
| commit | e1556533d3e57950417b2e35a68e95c65fee5042 (patch) | |
| tree | 41d67b065c7828e164af83254fb447849d9e880d /tests | |
| parent | 5d8d8f3b0a07edb3bd435830b076749f906537d8 (diff) | |
| parent | 92f1cefb74f6092c0c70f93140824ab806086272 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build-utils.scm | 7 | ||||
| -rw-r--r-- | tests/packages.scm | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/build-utils.scm b/tests/build-utils.scm index a5ea640c47..b0a4d1584a 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,6 +128,11 @@ (inputs `(("bash" ,(search-bootstrap-binary "bash" (%current-system))))))) (d (package-derivation %store p))) + + ;; The bootstrap Bash is linked against an old libc and would abort with + ;; an assertion failure when trying to load incompatible locale data. + (unsetenv "LOCPATH") + (and (build-derivations %store (pk 'drv d (list d))) (let* ((p (derivation->output-path d)) (foo (string-append p "/foo")) diff --git a/tests/packages.scm b/tests/packages.scm index ace2f36f19..b28ae0b662 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -321,7 +321,10 @@ (chmod "." #o777) (symlink "guile" "guile-rocks") (copy-recursively "../share/guile/2.0/scripts" - "scripts")))))) + "scripts") + + ;; Make sure '.file_list' can be created. + (chmod ".." #o777)))))) (package (package (inherit (dummy-package "with-snippet")) (source source) (build-system trivial-build-system) |