summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-13 14:08:13 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-13 14:08:13 (GMT)
commit301cd0e3169d62df18868cdc5329b7983dd9c379 (patch)
tree31137c57822d252608bd7a51a5e463dbed2ede60
parent4174b13a4b042b88a710e8bd4aa92af35bcf7d92 (diff)
parent5b68c7d62cf67a00bd6c5e97f1da7d7fd194ef00 (diff)
downloadtcl-301cd0e3169d62df18868cdc5329b7983dd9c379.zip
tcl-301cd0e3169d62df18868cdc5329b7983dd9c379.tar.gz
tcl-301cd0e3169d62df18868cdc5329b7983dd9c379.tar.bz2
merge trunk
-rw-r--r--tests/msgcat.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/msgcat.test b/tests/msgcat.test
index d75bf8e..0edb1d2 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -56,6 +56,13 @@ namespace eval ::msgcat::test {
set result [string tolower \
[msgcat::ConvertLocale $::tcl::mac::locale]]
} else {
+ if {([info sharedlibextension] == ".dll")
+ && ![catch {package require registry}]} {
+ # Windows and Cygwin have other ways to determine the
+ # locale when the environment variables are missing
+ # and the registry package is present
+ continue
+ }
set result c
}
}