[patch] 0001-tests-Use-any-available-UTF-8-locale-in-t0251-skip-i.patch (r1)

0001-tests-Use-any-available-UTF-8-locale-in-t0251-skip-i.patch (text/plain), 2.07 KB, created by kfm on 2023-01-25 16:59:13 UTC

From f621260650e6cb1ee37d63f887d63005844b2f0e Mon Sep 17 00:00:00 2001
From: Kerin Millar <[e-mail]>
Date: Wed, 25 Jan 2023 16:24:14 +0000
Subject: [PATCH] tests: Use any available UTF-8 locale in t0251; skip if none
 found

The "t0251-gpt-unicode.sh" test presently suffers from several issues
which are addressed herewith.

Do not begin by trying to match the "en_US.utf8" locale specifically.
The only requirement for the test to be performed correctly is that the
system character type be set to UTF-8. For this, any UTF-8 supporting
locale will do. Simply select the first locale that ends with ".utf8"
or "UTF-8". Hard though it may be to believe, not everyone is American.

Escape the dot/period in the locale-matching regular expression.

Skip the test outright if no UTF-8 supporting locale can be found,
rather than spuriously fail.

Assign the locale found to LC_CTYPE. There is no need to set any of the
other locale-related environment variables for the purpose of this
test. All that is required is to unset LC_ALL, so that LC_CTYPE cannot
possibly be overridden. Do so.

Signed-off-by: Kerin Millar <[e-mail]>
Bug: https://bugs.gentoo.org/753677
---
 tests/t0251-gpt-unicode.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh
index 05907ef..3b4ca29 100755
--- a/tests/t0251-gpt-unicode.sh
+++ b/tests/t0251-gpt-unicode.sh
@@ -22,11 +22,16 @@ dev=loop-file
 # create zeroed device
 truncate -s 10m $dev || fail=1
 
-LC_ALL=$(locale -a | grep en_US.utf8)
-if [ -z "$LC_ALL" ]; then
-   LC_ALL=C.UTF-8
+# LC_CTYPE must not be overridden
+unset LC_ALL
+
+# any UTF-8 locale will suffice for setting the character type
+LC_CTYPE=$(locale -a | awk '/\.(utf8|UTF-8)$/ { print; exit; }')
+if [ -z "$LC_CTYPE" ]; then
+	skip_ 'no UTF-8 supporting locale is available'
 fi
-export LC_ALL="$LC_ALL"
+export LC_CTYPE
+
 # create gpt label with named partition
 part_name=$(printf 'foo\341\264\244')
 parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
-- 
2.39.1