diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 21:17:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 21:21:02 +0200 |
| commit | 12cd4dd3a9052491e3912ffeecbe8854ea9b971a (patch) | |
| tree | cb844b9eaac4726ed96fa08e1fd82e2133bc163f /tests | |
| parent | 5c3c1427fa718ae89a7f893ac52d7a3fe8d99d60 (diff) | |
| download | patches-12cd4dd3a9052491e3912ffeecbe8854ea9b971a.tar patches-12cd4dd3a9052491e3912ffeecbe8854ea9b971a.tar.gz | |
tests: Unset 'LOCPATH' before running bootstrap program.
Reported by Mark H Weaver <mhw@netris.org>.
* tests/build-utils.scm ("wrap-program, one input, multiple calls"): Add
'unsetenv' call.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build-utils.scm | 7 |
1 files changed, 6 insertions, 1 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")) |