From 6617f192348f6ce71fd4ee16e55e9dc78927c520 Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Wed, 30 Mar 2022 09:42:57 +0900 Subject: 49908: reset LC_CTYPE to C during tests and do not export MODULE_PATH since child zsh will not import it --- ChangeLog | 4 ++++ Test/ztst.zsh | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96ef1d10c..585f13adb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2022-03-30 Jun-ichi Takimoto + + * 49908: Test/ztst.zsh: reset LC_CTYPE to C during tests. + 2022-03-29 Bart Schaefer * 49918: NEWS, README: Update for 49917 and 49911. diff --git a/Test/ztst.zsh b/Test/ztst.zsh index a59c06dcf..89fe69b5b 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -25,6 +25,7 @@ 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 @@ -36,8 +37,6 @@ typeset +x WORDCHARS # Set the module load path to correspond to this build of zsh. # This Modules directory should have been created by "make check". [[ -d Modules/zsh ]] && module_path=( $PWD/Modules ) -# Allow this to be passed down. -export MODULE_PATH # We need to be able to save and restore the options used in the test. # We use the $options variable of the parameter module for this. -- cgit 1.4.1