about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Test/13parameter.ztst4
-rwxr-xr-xTest/ztst.zsh5
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 37b3b1e28..d85d779ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-03  Peter Stephenson  <pws@cambridgesiliconradio.com>
+
+	* 11096: Test/ztst.zsh, Test/13parameter.ztst: fix test output
+	for C locale and ensure C locale is used
+
 2000-05-03  Sven Wischnowsky  <wischnow@informatik.hu-berlin.de>
 
 	* 11094: Doc/Zsh/compsys.yo: more doc fixes
diff --git a/Test/13parameter.ztst b/Test/13parameter.ztst
index a6e1dd2d9..872f0d3f0 100644
--- a/Test/13parameter.ztst
+++ b/Test/13parameter.ztst
@@ -229,9 +229,9 @@
   print ${(O)foo}
   print ${(Oi)foo}
 0:${(o)...}, ${(O)...}
+>I I be could programme recorded that watching
 >be could I I programme recorded that watching
->be could I I programme recorded that watching
->watching that recorded programme I I could be
+>watching that recorded programme could be I I
 >watching that recorded programme I I could be
 
   foo=(yOU KNOW, THE ONE WITH wILLIAM dALRYMPLE)
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index 32217bb3d..69306cb81 100755
--- a/Test/ztst.zsh
+++ b/Test/ztst.zsh
@@ -22,6 +22,11 @@
 # 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 $LANG ]] && LANG=C
+
 # 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 )