From 9282223de4b511aeda3b7d2caf3810a56a865710 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@tutanota.com>
Date: Mon, 10 Jan 2022 14:16:32 -0500
Subject: [PATCH] Use C locale unconditionally for tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ‘en_US.utf8’ locale is available. However, the ‘locale -a’ command won’t list it.
---
 tests/libtest-core.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/libtest-core.sh b/tests/libtest-core.sh
index 9632e90..82951dd 100644
--- a/tests/libtest-core.sh
+++ b/tests/libtest-core.sh
@@ -41,12 +41,7 @@ assert_not_reached () {
 #
 # If we can't find the locale command assume we have support for C.UTF-8
 # (e.g. musl based systems)
-if type -p locale >/dev/null; then
-    export LC_ALL=$(locale -a | grep -iEe '^(C|en_US)\.(UTF-8|utf8)$' | head -n1 || true)
-    if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
-else
-    export LC_ALL=C.UTF-8
-fi
+export LC_ALL=en_US.utf8
 # A GNU extension, used whenever LC_ALL is not C
 unset LANGUAGE
 
-- 
2.34.1

a class='active' href='/guix/log/etc/openrc'>log</a><a href='/guix/tree/etc/openrc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>tree</a><a href='/guix/commit/etc/openrc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>commit</a><a href='/guix/diff/etc/openrc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/openrc'>
<input type='hidden' name='id' value='a531af142ffdb2a31cf9e6258c336fcf2dbe755b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>root</a>/<a href='/guix/log/etc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>etc</a>/<a href='/guix/log/etc/openrc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b'>openrc</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/openrc?id=a531af142ffdb2a31cf9e6258c336fcf2dbe755b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-07-07 23:54:20 -0400'>2021-07-07</span></td><td><a href='/guix/commit/etc/openrc?id=4cbe0127a668cbcc64087c5d311308b59d39b104'>guix-install.sh: Prompt for configuring substitutes discovery.</a><span class='msg-avail'>...<span class='msg-tooltip'>Also ensure prompt_yes_no always print the message with a trailing space,
which is more pleasing to the eye.

* etc/guix-daemon.conf.in &lt;--discover=no&gt;: New guix-daemon option.
* etc/guix-daemon.service.in: Likewise.
* etc/init.d/guix-daemon.in: Likewise.
* etc/openrc/guix-daemon.in: Likewise.
* etc/guix-install.sh (configure_substitute_discovery): New procedure.
(sys_enable_guix_daemon): Ask the user whether automatic substitute discovery
should be enabled.  Set the '--discover' argument accordingly.
(prompt_yes_no): Add a trailing space to the message.
(sys_authorize_build_farms): Remove trailing space from the message argument.
* NEWS (Distribution): Add news.
</span></span></td><td>Maxim Cournoyer</td></tr>