summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Test/A06assign.ztst7
-rw-r--r--Test/B03print.ztst2
-rw-r--r--Test/E01options.ztst6
4 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e90bf8ecd..cb45e2119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-22 Andrey Borzenkov <bor@zsh.org>
+
+ * 22758: Test/A06assign.ztst, Test/B03print.ztst,
+ Test/E01options.ztst: force locale to C to avoid test failures
+ due to localized output
+
2006-09-21 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 22752: + Roman Neuhauser: Doc/Zsh/compsys.yo,
diff --git a/Test/A06assign.ztst b/Test/A06assign.ztst
index bbed909c5..ec5331bd0 100644
--- a/Test/A06assign.ztst
+++ b/Test/A06assign.ztst
@@ -55,6 +55,13 @@
(( 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 d6dea5a3d..3dcb4e74a 100644
--- a/Test/B03print.ztst
+++ b/Test/B03print.ztst
@@ -76,6 +76,8 @@
>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 da4020c15..f407ecb6b 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -195,6 +195,8 @@
>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
@@ -207,8 +209,8 @@
cd cdablevar2
1q:CDABLE_VARS option
>back in options.tmp
-?(eval):cd:4: no such file or directory: cdablevar1
-?(eval):cd:10: no such file or directory: cdablevar2
+?(eval):cd:6: no such file or directory: cdablevar1
+?(eval):cd:12: no such file or directory: cdablevar2
# CHASE_DOTS should go with CHASE_LINKS in B01cd.ztst
# which saves me having to write it here.