Re: PATCH: Re: Test failures

[Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxxx>]

> Felix Rosencrantz wrote:
> > I'm seeing a couple test failures.
> > *** /tmp/zsh.ztst.out.8907      Tue May  2 10:13:07 2000
> > --- /tmp/zsh.ztst.tout.8907     Tue May  2 10:13:07 2000
> > ***************
> > *** 1,4 ****
> >   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 I I could be
> > --- 1,4 ----
> > + I I be could programme recorded that watching
> >   be could I I programme recorded that watching
> > ! watching that recorded programme could be I I
> >   watching that recorded programme I I could be
> 
> Oh, look, the strings in the test are sorted with a locale that makes
> the order AaBbCc and so on. Either we should make the tests respect
> the locale setting or enforce the normal ordering (and change the
> strings above).

This restores the C order and sanitises the locale.

Index: Test/13parameter.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/13parameter.ztst,v
retrieving revision 1.1
diff -u -r1.1 13parameter.ztst
--- Test/13parameter.ztst	2000/04/19 19:03:09	1.1
+++ Test/13parameter.ztst	2000/05/03 09:10:50
@@ -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)
Index: Test/ztst.zsh
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/ztst.zsh,v
retrieving revision 1.3
diff -u -r1.3 ztst.zsh
--- Test/ztst.zsh	2000/04/19 19:03:09	1.3
+++ Test/ztst.zsh	2000/05/03 09:10:50
@@ -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 )

-- 
Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxxx>
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK                          Tel: +44 (0)1223 392070