merge trunk

FossilOrigin-Name: e5ba23a0a10886b91257f7d2a63e104b9b288027

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
 	    }
 	}