packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/core: Fallback to en_US.UTF-8 locale 

A number of tests expect explicit left/right single quotes in their
messages, which will never happen in the C locale. Change so we pick a
likely UTF-8 locale, or fail if we can't find one.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
This commit is contained in:
Alex Kiernan 2019-10-30 07:55:41 +00:00
parent d554cee2df
commit 4d17cd917f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/libtest-core.sh
View File

@ -35,15 +35,11 @@ assert_not_reached () {
} }
# Some tests look for specific English strings. Use a UTF-8 version # Some tests look for specific English strings. Use a UTF-8 version
# of the C (POSIX) locale if we have one, or fall back to POSIX # of the C (POSIX) locale if we have one, or fall back to en_US.UTF-8
# (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8) # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8)
if locale -a | grep '^C.UTF-8$' >/dev/null; then export LC_ALL=$(locale -a | grep -Ee '\.(UTF-8|utf8)' | grep -iEe '^(C|en_US)' | head -1 || true)
export LC_ALL=C.UTF-8 if [ -z "${LC_ALL}" ]; then fatal "Can't find suitable UTF-8 locale"; fi
elif locale -a | grep '^C.utf8$' >/dev/null; then
export LC_ALL=C.utf8
else
export LC_ALL=C
fi
# A GNU extension, used whenever LC_ALL is not C # A GNU extension, used whenever LC_ALL is not C
unset LANGUAGE unset LANGUAGE