aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-11-10 18:20:23 +0100
committerLudovic Courtès <ludo@gnu.org>2022-11-11 23:17:42 +0100
commit19206eee69e8c22d63104af1b7f1f815969bff7f (patch)
tree1a4118fcdc1f9ab65f326b9bb1d6f7a8178680d0 /tests
parent8c0c223fabdda37611b3df1f5789082a47507b09 (diff)
downloadguix-19206eee69e8c22d63104af1b7f1f815969bff7f.tar
guix-19206eee69e8c22d63104af1b7f1f815969bff7f.tar.gz
grafts: Run with a UTF-8 locale.
Fixes <https://issues.guix.gnu.org/55968>. Reported by Maxime Devos <maximedevos@telenet.be>. * guix/grafts.scm (%graft-with-utf8-locale?): New parameter. (graft-derivation/shallow)[glibc-locales, set-utf8-locale]: New variables. [build]: Use 'set-utf8-locale'. * tests/gexp.scm, tests/grafts.scm, tests/packages.scm: Set '%graft-with-utf8-locale?' to #f.
Diffstat (limited to 'tests')
-rw-r--r--tests/gexp.scm4
-rw-r--r--tests/grafts.scm5
-rw-r--r--tests/packages.scm3
3 files changed, 11 insertions, 1 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 6d57ac5d7a..7a90f8dcbf 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -21,6 +21,7 @@
#:use-module (guix store)
#:use-module (guix monads)
#:use-module (guix gexp)
+ #:use-module ((guix grafts) #:select (%graft-with-utf8-locale?))
#:use-module (guix derivations)
#:use-module (guix packages)
#:use-module (guix build-system trivial)
@@ -49,6 +50,9 @@
;; Globally disable grafts because they can trigger early builds.
(%graft? #f)
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
;; For white-box testing.
(define (gexp-inputs x)
((@@ (guix gexp) gexp-inputs) x))
diff --git a/tests/grafts.scm b/tests/grafts.scm
index 7e1959e4a7..63dbb13830 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2019, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@@ -35,6 +35,9 @@
(define %store
(open-connection-for-tests))
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
(define (bootstrap-binary name)
(let ((bin (search-bootstrap-binary name (%current-system))))
(and %store
diff --git a/tests/packages.scm b/tests/packages.scm
index a71eb1125d..a5819d8de3 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -75,6 +75,9 @@
;; can trigger builds early.)
(%graft? #f)
+;; When grafting, do not add dependency on 'glibc-utf8-locales'.
+(%graft-with-utf8-locale? #f)
+
(test-begin "packages")