1 files changed, 14 insertions, 18 deletions
diff --git a/tests/fileName.test b/tests/fileName.test
index d46391a..51f00d1 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -9,14 +9,15 @@
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: fileName.test,v 1.66 2010/01/05 18:58:36 dgp Exp $
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
+if {"::tcltest" ni [namespace children]} {
     package require tcltest 2
     namespace import -force ::tcltest::*
 }
 
+::tcltest::loadTestedCommands
+catch [list package require -exact Tcltest [info patchlevel]]
+
 testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testtranslatefilename [llength [info commands testtranslatefilename]]
 testConstraint linkDirectory 1
@@ -42,7 +43,7 @@ global env
 if {[testConstraint testsetplatform]} {
     set platform [testgetplatform]
 }
-
+
 # Caution: when using 'testsetplatform' to test different file name platform
 # descriptions in this file, one must be very careful not to combine such
 # platform manipulation with commands like 'cd', 'pwd'. That is because the
@@ -198,7 +199,7 @@ test filename-4.12 {Tcl_SplitPath: unix} {testsetplatform} {
 test filename-4.13 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split //foo
-} {/ foo}
+} "/ foo"
 test filename-4.14 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split foo//bar
@@ -435,11 +436,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}
+} "/a/b"
 test filename-7.18 {Tcl_JoinPath: unix} {testsetplatform} {
     testsetplatform unix
     file join /// a b
-} {/a/b}
+} "/a/b"
 
 test filename-9.1 {Tcl_JoinPath: win} {testsetplatform} {
     testsetplatform win
@@ -748,7 +749,7 @@ test filename-11.13 {Tcl_GlobCmd} {
 } [file join $env(HOME)]
 set oldpwd [pwd]
 set oldhome $env(HOME)
-cd [temporaryDirectory]
+catch {cd [makeDirectory tcl[pid]]}
 set env(HOME) [pwd]
 file delete -force globTest
 file mkdir globTest/a1/b1
@@ -1434,7 +1435,7 @@ test filename-16.13 {windows specific globbing} {win sharedCdrive} {
 } //[info hostname]/c/globTest
 test filename-16.14 {windows specific globbing} {win} {
     cd [lindex [glob -types d -dir C:/ *] 0]
-    expr {[lsearch -exact [glob {{.,*}*}] ".."] != -1}
+    expr {".." in [glob {{.,*}*}]}
 } {1}
 test filename-16.15 {windows specific globbing} {win} {
     cd [lindex [glob -types d -dir C:/ *] 0]
@@ -1529,7 +1530,6 @@ test fileName-20.4 {Bug 1750300} -setup {
     removeFile TAGS $d
     removeDirectory foo
 } -result 0
-
 test fileName-20.5 {Bug 2837800} -setup {
     set dd [makeDirectory isolate]
     set d [makeDirectory ./~foo $dd]
@@ -1544,7 +1544,6 @@ test fileName-20.5 {Bug 2837800} -setup {
     removeDirectory ./~foo $dd
     removeDirectory isolate
 } -result ~foo/test
-
 test fileName-20.6 {Bug 2837800} -setup {
     # Recall that we have $env(HOME) set so that references
     # to ~ point to [temporaryDirectory]
@@ -1561,7 +1560,6 @@ test fileName-20.6 {Bug 2837800} -setup {
     removeDirectory isolate
     removeFile test ~
 } -result {}
-
 test fileName-20.7 {Bug 2806250} -setup {
     set savewd [pwd]
     cd [temporaryDirectory]
@@ -1574,7 +1572,6 @@ test fileName-20.7 {Bug 2806250} -setup {
     removeDirectory isolate
     cd $savewd
 } -result 1
-
 test fileName-20.8 {Bug 2806250} -setup {
     set savewd [pwd]
     cd [temporaryDirectory]
@@ -1587,8 +1584,7 @@ test fileName-20.8 {Bug 2806250} -setup {
     removeDirectory isolate
     cd $savewd
 } -result ./~test
-
-test fileName-20.9 {} -setup {
+test fileName-20.9 {globbing for special chars} -setup {
     makeFile {} test ~
     set d [makeDirectory isolate]
     set savewd [pwd]
@@ -1600,8 +1596,7 @@ test fileName-20.9 {} -setup {
     removeDirectory isolate
     removeFile test ~
 } -result ~/test
-
-test fileName-20.10 {} -setup {
+test fileName-20.10 {globbing for special chars} -setup {
     set s [makeDirectory sub ~]
     makeFile {} fileName-20.10 $s
     set d [makeDirectory isolate]
@@ -1615,12 +1610,13 @@ test fileName-20.10 {} -setup {
     removeFile fileName-20.10 $s
     removeDirectory sub ~
 } -result ~/sub/fileName-20.10
-
+
 # cleanup
 catch {file delete -force C:/globTest}
 cd [temporaryDirectory]
 file delete -force globTest
 cd $oldpwd
+catch {removeDirectory tcl[pid]}
 set env(HOME) $oldhome
 if {[testConstraint testsetplatform]} {
     testsetplatform $platform