summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2004-03-05 15:48:02 (GMT)
committerKevin B Kenny <kennykb@acm.org>2004-03-05 15:48:02 (GMT)
commit4e286281a296a9f2cda90be0e756e5352d2011eb (patch)
tree999e0efba583daa20cc043d0cb9c444cf47e1a5b
parentcf1e468be705db2cb0be93a9aa28aacdb838550c (diff)
downloadtcl-4e286281a296a9f2cda90be0e756e5352d2011eb.zip
tcl-4e286281a296a9f2cda90be0e756e5352d2011eb.tar.gz
tcl-4e286281a296a9f2cda90be0e756e5352d2011eb.tar.bz2
* tests/registry.test: Applied fix from Patch #910174 to make the test for an English-language system include any country code, rather than just English-United States.1252. Thanks to Pat Thoyts for the changes.
-rw-r--r--ChangeLog7
-rw-r--r--tests/registry.test6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index abb88f2..c62df78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-05 Kevin B. Kenny <kennykb@acm.org>
+
+ * tests/registry.test: Applied fix from Patch #910174 to
+ make the test for an English-language system include any
+ country code, rather than just English-United States.1252.
+ Thanks to Pat Thoyts for the changes.
+
2004-03-04 Pat Thoyts <patthoyts@users.sourceforge.net>
* tests/registry.test: Applied fixed from #766159 to skip two
diff --git a/tests/registry.test b/tests/registry.test
index 69917e3..cace66f 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -10,7 +10,7 @@
# Copyright (c) 1997 by Sun Microsystems, Inc. All rights reserved.
# Copyright (c) 1998-1999 by Scriptics Corporation.
#
-# RCS: @(#) $Id: registry.test,v 1.15 2004/03/04 23:02:01 patthoyts Exp $
+# RCS: @(#) $Id: registry.test,v 1.16 2004/03/05 15:48:03 kennykb Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -30,7 +30,7 @@ if {$tcl_platform(platform) == "windows"} {
# determine the current locale
testConstraint english [expr {[llength [info commands testlocale]]
- && [string equal [testlocale all ""] "English_United States.1252"]
+ && [string match "English*" [testlocale all ""]]
}]
set hostname [info hostname]
@@ -528,7 +528,7 @@ test registry-9.3 {ParseKeyName: bad keys} {pcOnly} {
test registry-9.4 {ParseKeyName: bad keys} {pcOnly} {
list [catch {registry values \\\\\\} msg] $msg
} {1 {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-9.5 {ParseKeyName: bad keys} {pcOnly english} {
+test registry-9.5 {ParseKeyName: bad keys} {pcOnly english nt} {
list [catch {registry values \\\\\\HKEY_CLASSES_ROOT} msg] $msg
} {1 {unable to open key: The network address is invalid.}}
test registry-9.6 {ParseKeyName: bad keys} {pcOnly} {