diff options
author | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2022-09-26 11:09:22 +0900 |
---|---|---|
committer | Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> | 2022-09-26 11:09:22 +0900 |
commit | 1e4c7bcae5daec29cbf85968e013576d665c3816 (patch) | |
tree | d79a05850fbb0b83695313841b243d4d91a9fa22 | |
parent | 1b421e4978440234fb73117c8505dad1ccc68d46 (diff) | |
download | zsh-1e4c7bcae5daec29cbf85968e013576d665c3816.tar.gz zsh-1e4c7bcae5daec29cbf85968e013576d665c3816.tar.xz zsh-1e4c7bcae5daec29cbf85968e013576d665c3816.zip |
50662: unset LC_* for all the tests
-rw-r--r-- | ChangeLog | 2 | ||||
-rwxr-xr-x | Test/ztst.zsh | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 77345c050..597fd9093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2022-09-26 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + * 50662: Test/ztst.zsh: unset LC_* for all the tests + * 50658 + test: Src/Modules/pcre.c, Test/V07pcre.ztst: Enable to switch between C/UTF-8 locales in PCRE diff --git a/Test/ztst.zsh b/Test/ztst.zsh index d95b726e7..ea1b016d5 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -25,23 +25,13 @@ # still not be good enough. Maybe we should trick it somehow. emulate -R zsh -# Ensure the locale does not screw up sorting. Don't supply a locale -# unless there's one set, to minimise problems. -[[ -n $LC_ALL ]] && LC_ALL=C -[[ -n $LC_CTYPE ]] && LC_CTYPE=C -[[ -n $LC_COLLATE ]] && LC_COLLATE=C -[[ -n $LC_NUMERIC ]] && LC_NUMERIC=C -[[ -n $LC_MESSAGES ]] && LC_MESSAGES=C -[[ -n $LANG ]] && LANG=C -# Test file may (or may not) set LANG to other locales. In either case, -# LANG must be passed to child zsh. -export LANG +# By default tests are run in C locale. LANG must be passed to child zsh. +unset -m LC_\* +export LANG=C # find UTF-8 locale ZTST_find_UTF8 () { setopt multibyte - # Don't let LC_* override our choice of locale. - unset -m LC_\* local langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8 ${(M)$(locale -a 2>/dev/null):#*.(utf8|UTF-8)}) for LANG in $langs; do |