[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: tests: Unset 'LOCPATH' before running bootstrap program.
From: |
Ludovic Courtès |
Subject: |
03/03: tests: Unset 'LOCPATH' before running bootstrap program. |
Date: |
Thu, 24 Sep 2015 19:30:48 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 12cd4dd3a9052491e3912ffeecbe8854ea9b971a
Author: Ludovic Courtès <address@hidden>
Date: Thu Sep 24 21:17:47 2015 +0200
tests: Unset 'LOCPATH' before running bootstrap program.
Reported by Mark H Weaver <address@hidden>.
* tests/build-utils.scm ("wrap-program, one input, multiple calls"): Add
'unsetenv' call.
---
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 a5ea640..b0a4d15 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 <address@hidden>
+;;; Copyright © 2012, 2015 Ludovic Courtès <address@hidden>
;;;
;;; 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"))