summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-04-06 14:39:16 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-04-06 14:39:16 (GMT)
commitbd25b5076fe69103b8dc106ff6930f61c702eda0 (patch)
tree081a0b900ae23b9bbd167f3620879dcf7dd0c8b5
parent14da1fa7d49f60c7ca1a74bb9018edf2c8d88c6c (diff)
downloadtcl-bd25b5076fe69103b8dc106ff6930f61c702eda0.zip
tcl-bd25b5076fe69103b8dc106ff6930f61c702eda0.tar.gz
tcl-bd25b5076fe69103b8dc106ff6930f61c702eda0.tar.bz2
* tests/unixInit.test (unixInit-3.1): Default encoding on Darwin
systems is utf-8. Thanks to Steven Abner (tauvan). [Bug 928808]
-rw-r--r--ChangeLog5
-rw-r--r--tests/unixInit.test6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b101738..6fb73e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-06 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/unixInit.test (unixInit-3.1): Default encoding on Darwin
+ systems is utf-8. Thanks to Steven Abner (tauvan). [Bug 928808]
+
2004-04-06 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* tests/cmdAH.test (cmdAH-18.2): Added constraint because
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 8560a1e..880ea54 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: unixInit.test,v 1.30.2.6 2004/02/25 23:38:17 dgp Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.30.2.7 2004/04/06 14:39:16 dgp Exp $
package require tcltest 2
namespace import -force ::tcltest::*
@@ -314,7 +314,9 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints {
unset env(LANG)
set enc
-} -match regexp -result ^iso8859-15?$
+} -match regexp -result [expr {
+ ($tcl_platform(os) eq "Darwin") ? "^utf-8$" : "^iso8859-15?$"}]
+
test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly stdio} {
set env(LANG) japanese
catch {set oldlc_all $env(LC_ALL)}