** upport to 8.4 of mac code changes for 8.3.3 & various new

	**  changes for 8.4, some already backported to 8.3.4 (patch #435658)

see ChangeLog for details

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/fileName.test b/tests/fileName.test
index 757a8d9..b7616f3 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -10,7 +10,7 @@
 # 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.15 2001/10/29 15:02:44 vincentdarley Exp $
+# RCS: @(#) $Id: fileName.test,v 1.16 2001/11/23 01:26:06 das Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -304,6 +304,11 @@ test filename-4.18 {Tcl_SplitPath: unix} {testsetplatform} {
     testsetplatform unix
     file split foo/bar~/baz
 } {foo bar~ baz}
+
+if {[tcltest::testConstraint testsetplatform]} {
+    testsetplatform $platform
+}
+
 test filename-4.19 {Tcl_SplitPath} {
     set oldDir [pwd]
     set res [catch {
@@ -317,6 +322,7 @@ test filename-4.19 {Tcl_SplitPath} {
 	set idx [string first tildetmp $norm]
 	set norm [string range $norm $idx end]
 	# fix path away so all platforms are the same
+	regsub {(.*):$} $norm {\1} norm
 	regsub -all ":" $norm "/" norm
 	# make sure we can delete the directory we created
 	cd $oldDir
@@ -1717,7 +1723,7 @@ test filename-16.13 {windows specific globbing} {pcOnly sharedCdrive} {
 } //[info hostname]/c/globTest
 
 # cleanup
-file delete -force C:/globTest
+catch {file delete -force C:/globTest}
 cd $oldDir
 file delete -force globTest
 set env(HOME) $oldhome