diff options
| author | Andrey Borzenkov <bor@users.sourceforge.net> | 2006-09-23 06:55:29 +0000 |
|---|---|---|
| committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2006-09-23 06:55:29 +0000 |
| commit | daed9601f723dfad8dbbd41b084807f160c94c8c (patch) | |
| tree | 5dd4962336f3bc93c45e37732af32beb8d3018e1 | |
| parent | 4e576c069c36bd31c6bbd57ba661361cb29274c9 (diff) | |
| download | zsh-daed9601f723dfad8dbbd41b084807f160c94c8c.tar.gz zsh-daed9601f723dfad8dbbd41b084807f160c94c8c.tar.xz zsh-daed9601f723dfad8dbbd41b084807f160c94c8c.zip | |
revert 22758 and add LC_NUMERIC and LC_MESSAGES
to test harness instead
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Test/A06assign.ztst | 7 | ||||
| -rw-r--r-- | Test/B03print.ztst | 2 | ||||
| -rw-r--r-- | Test/E01options.ztst | 6 | ||||
| -rwxr-xr-x | Test/ztst.zsh | 2 |
5 files changed, 11 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index cb45e2119..d1cdefe20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-23 Andrey Borzenkov <bor@zsh.org> + + * unposted: Test/A06assign.ztst, Test/B03print.ztst, + Test/E01options.ztst, Test/ztst.zsh: as pointed by Bart in 22758, + locale is already taken care of in test harness; revert 22758 + and add LC_NUMERIC and LC_MESSAGES to list of locale variables to set. + 2006-09-22 Andrey Borzenkov <bor@zsh.org> * 22758: Test/A06assign.ztst, Test/B03print.ztst, diff --git a/Test/A06assign.ztst b/Test/A06assign.ztst index ec5331bd0..bbed909c5 100644 --- a/Test/A06assign.ztst +++ b/Test/A06assign.ztst @@ -55,13 +55,6 @@ (( i == 30 )) 0:add to integer -# According to official printf info page: -# A floating-point argument must use a period before any fractional -# digits, but is printed according to the `LC_NUMERIC' category of the -# current locale. -# So, force LC_ALL to be C (otherwise it overrides LC_NUMERIC) - - LC_ALL=C LC_NUMERIC=C float f=3.4 f+=2.3 printf "%g\n" f diff --git a/Test/B03print.ztst b/Test/B03print.ztst index 3dcb4e74a..d6dea5a3d 100644 --- a/Test/B03print.ztst +++ b/Test/B03print.ztst @@ -76,8 +76,6 @@ >123 678 >90 0 -# See A06assign for full explanation - LC_ALL=C LC_NUMERIC=C printf '%g %g\n' 123.45 678 90.1 0:test g format specifier >123.45 678 diff --git a/Test/E01options.ztst b/Test/E01options.ztst index f407ecb6b..da4020c15 100644 --- a/Test/E01options.ztst +++ b/Test/E01options.ztst @@ -195,8 +195,6 @@ >8#21 >023 - # now-a-days cd can easily be localized. Force default (POSIX) locale - LC_ALL=C LC_MESSAGES=C setopt cdablevars # only absolute paths are eligible for ~-expansion cdablevar1=tmpcd @@ -209,8 +207,8 @@ cd cdablevar2 1q:CDABLE_VARS option >back in options.tmp -?(eval):cd:6: no such file or directory: cdablevar1 -?(eval):cd:12: no such file or directory: cdablevar2 +?(eval):cd:4: no such file or directory: cdablevar1 +?(eval):cd:10: no such file or directory: cdablevar2 # CHASE_DOTS should go with CHASE_LINKS in B01cd.ztst # which saves me having to write it here. diff --git a/Test/ztst.zsh b/Test/ztst.zsh index 348ec4a7f..77ff30e8d 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -26,6 +26,8 @@ emulate -R zsh # unless there's one set, to minimise problems. [[ -n $LC_ALL ]] && LC_ALL=C [[ -n $LC_COLLATE ]] && LC_COLLATE=C +[[ -n $LC_NUMERIC ]] && LC_NUMERIC=C +[[ -n $LC_MESSAGES ]] && LC_MESSAGES=C [[ -n $LANG ]] && LANG=C # Set the module load path to correspond to this build of zsh. |