diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2011-06-03 20:55:40 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2011-06-03 20:55:40 +0000 |
| commit | 16324d2ff347e96e43dd95780ff014d2183faf8d (patch) | |
| tree | 76f13ea525b2b84ad53da0eced73e10153ad2115 | |
| parent | e468775400a345dbe0acc4e68891bae5127e6f98 (diff) | |
| download | zsh-16324d2ff347e96e43dd95780ff014d2183faf8d.tar.gz zsh-16324d2ff347e96e43dd95780ff014d2183faf8d.tar.xz zsh-16324d2ff347e96e43dd95780ff014d2183faf8d.zip | |
29422: fix g:: test failing in some locales
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Test/D04parameter.ztst | 21 |
2 files changed, 11 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 332bcdb20..3377ae3ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * 29448: Completion/Unix/Command/_initctl: complete symlinks to files too. + * 29422: Test/D04parameter.ztst: Fix test for g:: to not depend + on the current locale. + 2011-06-03 Peter Stephenson <p.w.stephenson@ntlworld.com> * 29413: Doc/Zsh/builtins.yo, Src/builtin.c, Src/hist.c: print @@ -14939,5 +14942,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5358 $ +* $Revision: 1.5359 $ ***************************************************** diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst index 6379c8cd0..378505e12 100644 --- a/Test/D04parameter.ztst +++ b/Test/D04parameter.ztst @@ -300,23 +300,16 @@ foo='\u65\123' print -r ${(g:o:)foo} - foo='\u65\0123' + foo='\u65\0123^X\C-x' print -r ${(g::)foo} - foo='\u65^X' - print -r ${(V)${(g:c:)foo}} - foo='\u65\C-x\M-a' - print -r ${(V)${(g:e:)foo}} - foo='\u65\123\C-x' - print -r ${(V)${(g:eo:)foo}} - foo=('\u65' '\0123' '^X\M-a') - print -r ${(V)${(g:e:)foo}} + foo='^X' + bar='\C-\130' + [[ ${(g:c:)foo} == ${(g:oe:)bar} ]] + echo $? 0:${(g)...} >eS ->eS ->e^X ->e^X\M-a ->eS^X ->e S ^X\M-a +>eS^X\C-x +>0 foo='I'\''m nearly out of my mind with tedium' bar=foo |