summaryrefslogtreecommitdiffstats
path: root/tests/msgcat.test
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-01-30 20:49:03 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-01-30 20:49:03 (GMT)
commitdc03444f53228daafc69911cd9dd8fbb5b14ddc5 (patch)
treeaafa919c7650a1828ec8aa9265777b6a31dda560 /tests/msgcat.test
parent4445787a0a5228ad9d533415e563d6ae0ec517bf (diff)
downloadtcl-dc03444f53228daafc69911cd9dd8fbb5b14ddc5.zip
tcl-dc03444f53228daafc69911cd9dd8fbb5b14ddc5.tar.gz
tcl-dc03444f53228daafc69911cd9dd8fbb5b14ddc5.tar.bz2
For msgcat, select modernizations from Patrick Fradin + -debug fix.
Diffstat (limited to 'tests/msgcat.test')
-rw-r--r--tests/msgcat.test13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 0edb1d2..70a7af2 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -12,7 +12,7 @@
# Note that after running these tests, entries will be left behind in the
# message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
-package require Tcl 8.2
+package require Tcl 8.5
if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
@@ -56,7 +56,7 @@ namespace eval ::msgcat::test {
set result [string tolower \
[msgcat::ConvertLocale $::tcl::mac::locale]]
} else {
- if {([info sharedlibextension] == ".dll")
+ if {([info sharedlibextension] eq ".dll")
&& ![catch {package require registry}]} {
# Windows and Cygwin have other ways to determine the
# locale when the environment variables are missing
@@ -72,7 +72,7 @@ namespace eval ::msgcat::test {
variable var
foreach var $envVars {
catch {variable $var $::env($var)}
- catch {unset ::env($var)}
+ unset -nocomplain ::env($var)
}
foreach var $setVars {
set ::env($var) $var
@@ -84,13 +84,13 @@ namespace eval ::msgcat::test {
} -cleanup {
interp delete [namespace current]::i
foreach var $envVars {
- catch {unset ::env($var)}
+ unset -nocomplain ::env($var)
catch {set ::env($var) [set [namespace current]::$var]}
}
} -body {i eval msgcat::mclocale} -result $result
incr count
}
- catch {unset result}
+ unset -nocomplain result
# Could add tests of initialization from Windows registry here.
# Use a fake registry package.
@@ -324,7 +324,7 @@ namespace eval ::msgcat::test {
incr count
}
}
- catch {unset result}
+ unset -nocomplain result
# Tests msgcat-4.*: [mcunknown]
@@ -655,7 +655,6 @@ namespace eval ::msgcat::test {
removeFile l2.msg $msgdir2
removeDirectory msgdir2
- removeFile l3.msg $msgdir3
removeDirectory msgdir3
cleanupTests