finalization and test fixes

4 files changed, 16 insertions, 15 deletions

diff --git a/tests/basic.test b/tests/basic.test
index 52c1484..dbc5216 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -15,7 +15,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: basic.test,v 1.23 2002/07/10 11:56:44 dgp Exp $
+# RCS: @(#) $Id: basic.test,v 1.24 2003/02/04 17:06:52 vincentdarley Exp $
 #
 
 package require tcltest 2
@@ -587,7 +587,7 @@ test basic-46.2 {Tcl_AllowExceptions: exception return not allowed} {exec} {
     } BREAKtest]
     set res [list [catch {exec [interpreter] $fName} msg] $msg]
     removeFile BREAKtest
-    regsub {"[^ ]*BREAKtest"} $res {"BREAKtest"} res
+    regsub {file ".*BREAKtest"} $res {file "BREAKtest"} res
     set res
 } {1 {hello
 invoked "break" outside of a loop
@@ -603,7 +603,7 @@ test basic-46.3 {Tcl_AllowExceptions: exception return not allowed} {exec} {
     } BREAKtest]
     set res [list [catch {exec [interpreter] $fName} msg] $msg]
     removeFile BREAKtest
-    regsub {"[^ ]*BREAKtest"} $res {"BREAKtest"} res
+    regsub {file ".*BREAKtest"} $res {file "BREAKtest"} res
     set res
 } {1 {invoked "break" outside of a loop
     while executing
@@ -616,7 +616,7 @@ test basic-46.4 {Tcl_AllowExceptions: exception return not allowed} {exec} {
     } BREAKtest]
     set res [list [catch {exec [interpreter] $fName} msg] $msg]
     removeFile BREAKtest
-    regsub {"[^ ]*BREAKtest"} $res {"BREAKtest"} res
+    regsub {file ".*BREAKtest"} $res {file "BREAKtest"} res
     set res
 } {1 {invoked "break" outside of a loop
     while executing
@@ -631,7 +631,7 @@ test basic-46.5 {Tcl_AllowExceptions: exception return not allowed} {exec} {
     } BREAKtest]
     set res [list [catch {exec [interpreter] $fName} msg] $msg]
     removeFile BREAKtest
-    regsub {"[^ ]*BREAKtest"} $res {"BREAKtest"} res
+    regsub {file ".*BREAKtest"} $res {file "BREAKtest"} res
     set res
 } {1 {command returned bad code: 2
     while executing
diff --git a/tests/fileName.test b/tests/fileName.test
index 580ec90..5f70555 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.27 2002/11/13 22:11:41 vincentdarley Exp $
+# RCS: @(#) $Id: fileName.test,v 1.28 2003/02/04 17:06:52 vincentdarley Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -1825,6 +1825,7 @@ test filename-17.1 {windows specific special files} {testsetplatform} {
 
 # cleanup
 catch {file delete -force C:/globTest}
+cd [temporaryDirectory]
 file delete -force globTest
 cd $oldpwd
 set env(HOME) $oldhome
@@ -1832,6 +1833,6 @@ if {[tcltest::testConstraint testsetplatform]} {
     testsetplatform $platform
     catch {unset platform}
 }
-catch {unset oldhome temp result}
+catch {unset oldhome temp result globPreResult}
 ::tcltest::cleanupTests
 return
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 7740b34..3dbaf88 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -390,7 +390,7 @@ test filesystem-6.33 {empty file name} {
 while {![catch {testfilesystem 0}]} {}
 }
 
-test filesystem-7.1 {load from vfs} {win knownBug} {
+test filesystem-7.1 {load from vfs} {win} {
     # This may cause a crash on exit
     set dir [pwd]
     cd [file dirname [info nameof]]
diff --git a/tests/io.test b/tests/io.test
index 648f5e7..465fc3b 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: io.test,v 1.37 2002/07/30 18:36:26 andreas_kupries Exp $
+# RCS: @(#) $Id: io.test,v 1.38 2003/02/04 17:06:52 vincentdarley Exp $
 
 if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
@@ -5531,12 +5531,12 @@ testConstraint testfevent [llength [info commands testfevent]]
 test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent} {
     testfevent create
     testfevent cmd [format {
-        set f [open %s r]
-        set x "no event"
-        fileevent $f readable [namespace code {
-            set x "f triggered: [gets $f]"
-            fileevent $f readable {}
-        }]
+	set f [open {%s} r]
+	set x "no event"
+	fileevent $f readable [namespace code {
+	    set x "f triggered: [gets $f]"
+	    fileevent $f readable {}
+	}]
     } $path(foo)]
     after 1	;# We must delay because Windows takes a little time to notice
     update