summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-06-25 09:23:23 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-06-25 09:23:23 (GMT)
commit6de91b6b7d469c5f8d511700b75689df23e43fd1 (patch)
tree90f2e6301f5b1f1d4ece4510cdfe8b9dadcf074d /tests
parent4eb006ef70aa3737a687697eb03ba83b080e1a1a (diff)
parent076eb7c9e473f60d3821b1fcc622f69fbb8eba14 (diff)
downloadtcl-6de91b6b7d469c5f8d511700b75689df23e43fd1.zip
tcl-6de91b6b7d469c5f8d511700b75689df23e43fd1.tar.gz
tcl-6de91b6b7d469c5f8d511700b75689df23e43fd1.tar.bz2
merge trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/fileName.test6
-rw-r--r--tests/msgcat.test4
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/fileName.test b/tests/fileName.test
index affacff..251f12c 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -196,7 +196,7 @@ test filename-4.12 {Tcl_SplitPath: unix} {testsetplatform} {
test filename-4.13 {Tcl_SplitPath: unix} {testsetplatform} {
testsetplatform unix
file split //foo
-} {/ foo}
+} "[file split //] foo"
test filename-4.14 {Tcl_SplitPath: unix} {testsetplatform} {
testsetplatform unix
file split foo//bar
@@ -433,11 +433,11 @@ test filename-7.16 {Tcl_JoinPath: unix} {testsetplatform} {
test filename-7.17 {Tcl_JoinPath: unix} {testsetplatform} {
testsetplatform unix
file join //a b
-} {/a/b}
+} "[file split //]a/b"
test filename-7.18 {Tcl_JoinPath: unix} {testsetplatform} {
testsetplatform unix
file join /// a b
-} {/a/b}
+} "[file split //]a/b"
test filename-9.1 {Tcl_JoinPath: win} {testsetplatform} {
testsetplatform win
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 0669810..6fe4b31 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.2}]} {
- puts stderr "Skipping tests in [info script]. No msgcat 1.4.2 found to test."
+if {[catch {package require msgcat 1.4.4}]} {
+ puts stderr "Skipping tests in [info script]. No msgcat 1.4.4 found to test."
return
}