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/build-utils.scm | |
| parent | 5c3c1427fa718ae89a7f893ac52d7a3fe8d99d60 (diff) | |
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/build-utils.scm')
| -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 a5ea640c479..b0a4d1584a9 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -128,6 +128,11 @@ | |||
| 128 | (inputs `(("bash" ,(search-bootstrap-binary "bash" | 128 | (inputs `(("bash" ,(search-bootstrap-binary "bash" |
| 129 | (%current-system))))))) | 129 | (%current-system))))))) |
| 130 | (d (package-derivation %store p))) | 130 | (d (package-derivation %store p))) |
| 131 | |||
| 132 | ;; The bootstrap Bash is linked against an old libc and would abort with | ||
| 133 | ;; an assertion failure when trying to load incompatible locale data. | ||
| 134 | (unsetenv "LOCPATH") | ||
| 135 | |||
| 131 | (and (build-derivations %store (pk 'drv d (list d))) | 136 | (and (build-derivations %store (pk 'drv d (list d))) |
| 132 | (let* ((p (derivation->output-path d)) | 137 | (let* ((p (derivation->output-path d)) |
| 133 | (foo (string-append p "/foo")) | 138 | (foo (string-append p "/foo")) |
