summary refs log tree commit diff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2022-03-30 09:42:57 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2022-03-30 09:42:57 +0900
commit6617f192348f6ce71fd4ee16e55e9dc78927c520 (patch)
tree3e8360431b06eafdb7a1d4f0f35546d5ffb75c1e
parent85f98c3604bb72b74a37ca335fb89cef7a0d78a8 (diff)
downloadzsh-6617f192348f6ce71fd4ee16e55e9dc78927c520.tar.gz
zsh-6617f192348f6ce71fd4ee16e55e9dc78927c520.tar.xz
zsh-6617f192348f6ce71fd4ee16e55e9dc78927c520.zip
49908: reset LC_CTYPE to C during tests
and do not export MODULE_PATH since child zsh will not import it
-rw-r--r--ChangeLog4
-rwxr-xr-xTest/ztst.zsh3
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  <takimoto-j@kba.biglobe.ne.jp>
+
+	* 49908: Test/ztst.zsh: reset LC_CTYPE to C during tests.
+
 2022-03-29  Bart Schaefer  <schaefer@zsh.org>
 
 	* 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.