43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From eda769be72def8a14098af968e04cc6952fc53a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bruno Haible <bruno@clisp.org>
|
||
|
|
Date: Mon, 8 Jul 2024 14:06:16 +0200
|
||
|
|
Subject: tests: Fix recognition of cs_CZ.UTF-8 locale on FreeBSD.
|
||
|
|
|
||
|
|
* tests/fmbtest: Use 'locale charmap' to determine the locale's encoding.
|
||
|
|
* tests/foad1: Likewise.
|
||
|
|
|
||
|
|
---
|
||
|
|
tests/fmbtest | 2 +-
|
||
|
|
tests/foad1 | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/fmbtest b/tests/fmbtest
|
||
|
|
index e64b6ba..ddc25d9 100644
|
||
|
|
--- a/tests/fmbtest
|
||
|
|
+++ b/tests/fmbtest
|
||
|
|
@@ -10,7 +10,7 @@
|
||
|
|
cz=cs_CZ.UTF-8
|
||
|
|
|
||
|
|
# If cs_CZ.UTF-8 locale doesn't work, skip this test.
|
||
|
|
-LC_ALL=$cz locale -k LC_CTYPE 2>/dev/null | grep -q charmap.*UTF-8 \
|
||
|
|
+test "`LC_ALL=$cz locale charmap 2>/dev/null`" = UTF-8 \
|
||
|
|
|| skip_ this system lacks the $cz locale
|
||
|
|
|
||
|
|
# If matching is done in single-byte mode, skip this test too
|
||
|
|
diff --git a/tests/foad1 b/tests/foad1
|
||
|
|
index f10c1d7..3e87656 100644
|
||
|
|
--- a/tests/foad1
|
||
|
|
+++ b/tests/foad1
|
||
|
|
@@ -150,7 +150,7 @@ Exit $failures
|
||
|
|
# The rest of this file is meant to be executed under this locale.
|
||
|
|
LC_ALL=cs_CZ.UTF-8; export LC_ALL
|
||
|
|
# If the UTF-8 locale doesn't work, skip these tests silently.
|
||
|
|
-locale -k LC_CTYPE 2>/dev/null | grep -q "charmap.*UTF-8" || Exit $failures
|
||
|
|
+test "`locale charmap 2>/dev/null`" = UTF-8 || Exit $failures
|
||
|
|
|
||
|
|
# Test character class erroneously matching a '[' character.
|
||
|
|
grep_test "[/" "" "[[:alpha:]]" -E
|
||
|
|
--
|
||
|
|
2.9.3.windows.1
|
||
|
|
|