From cc73339b97901cf1e50f07a6f0114974b34592c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 23 Nov 2016 21:10:49 +0100
Subject: [PATCH] tests: Remove 'GUIX_LOCPATH' hack that had been added for
glibc@2.23.
* gnu/tests/base.scm (run-basic-test)[test]("locale"): Remove
'GUIX_LOCPATH' hack, which is no longer needed since
commit 9f58fe3d1c32e3f0ced065e286532a10cad1b5e3.
---
gnu/tests/base.scm | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 86242d9665d..6370d6951bf 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -199,14 +199,8 @@ (define marionette
(test-equal "locale"
"en_US.utf8"
- (marionette-eval '(begin
- ;; XXX: This 'setenv' call wouldn't be needed
- ;; but our glibc@2.23 currently ignores
- ;; /run/current-system/locale.
- (setenv "GUIX_LOCPATH"
- "/run/current-system/locale")
- (let ((before (setlocale LC_ALL "en_US.utf8")))
- (setlocale LC_ALL before)))
+ (marionette-eval '(let ((before (setlocale LC_ALL "en_US.utf8")))
+ (setlocale LC_ALL before))
marionette))
(test-assert "/run/current-system is a GC root"
--
GitLab