From daed9601f723dfad8dbbd41b084807f160c94c8c Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <bor@users.sourceforge.net>
Date: Sat, 23 Sep 2006 06:55:29 +0000
Subject: revert 22758 and add LC_NUMERIC and LC_MESSAGES to test harness
 instead

---
 Test/A06assign.ztst  | 7 -------
 Test/B03print.ztst   | 2 --
 Test/E01options.ztst | 6 ++----
 Test/ztst.zsh        | 2 ++
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'Test')

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.
-- 
cgit 1.4.1