merge trunk

2 files changed, 10 insertions, 2 deletions

diff --git a/tests/encoding.test b/tests/encoding.test
index 51b7aa1..b4ee7c3 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -582,6 +582,14 @@ file delete {*}[glob -directory [temporaryDirectory] *.chars *.tcltestout]
 # EscapeFreeProc, GetTableEncoding, unilen are fully tested by the rest of
 # this file.
 
+
+test encoding-27.1 {encoding dirs basic behavior} -returnCodes error -body {
+    encoding dirs ? ?
+} -result {wrong # args: should be "encoding dirs ?dirList?"}
+test encoding-27.2 {encoding dirs basic behavior} -returnCodes error -body {
+    encoding dirs "\{not a list"
+} -result "expected directory list but got \"\{not a list\""
+
 }
 runtests
 
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 6fe4b31..bbcd023 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -17,8 +17,8 @@ if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
     return
 }
-if {[catch {package require msgcat 1.4.4}]} {
-    puts stderr "Skipping tests in [info script].  No msgcat 1.4.4 found to test."
+if {[catch {package require msgcat 1.4.5}]} {
+    puts stderr "Skipping tests in [info script].  No msgcat 1.4.5 found to test."
     return
 }