From 770750a2fc0896392316d3e90e4e5d8e3f6af927 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 2 Jul 2002 19:10:56 +0000
Subject:         * doc/tcltest.n:                Reverted [makeFile] and
 [viewFile] to         * library/tcltest/tcltest.tcl:  their former behavior,
 and documented         * tests/cmdAH.test:             it.  Corrected
 misspelling of hook         * tests/event.test:             procedure. 
 Restored tests.         * tests/http.test:         * tests/io.test:

---
 ChangeLog                   |    7 +
 doc/tcltest.n               |   18 +-
 library/tcltest/tcltest.tcl |   14 +-
 tests/cmdAH.test            |    4 +-
 tests/event.test            |    7 +-
 tests/http.test             |    6 +-
 tests/io.test               | 2884 ++++++++++++++++++-------------------------
 7 files changed, 1248 insertions(+), 1692 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 105fb39..27c1743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2002-07-02  Don Porter  <dgp@users.sourceforge.net>
 
+	* doc/tcltest.n:		Reverted [makeFile] and [viewFile] to
+	* library/tcltest/tcltest.tcl:	their former behavior, and documented
+	* tests/cmdAH.test:		it.  Corrected misspelling of hook
+	* tests/event.test:		procedure.  Restored tests.
+	* tests/http.test:
+	* tests/io.test:
+
 	* library/tcltest/tcltest.tcl: Simplified logic of [GetMatchingFiles]
 	and [GetMatchingDirectories], removing special case processing.
 
diff --git a/doc/tcltest.n b/doc/tcltest.n
index 4982d7c..c95ef9c 100644
--- a/doc/tcltest.n
+++ b/doc/tcltest.n
@@ -8,7 +8,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: tcltest.n,v 1.25 2002/07/02 13:28:51 dgp Exp $
+'\" RCS: @(#) $Id: tcltest.n,v 1.26 2002/07/02 19:10:57 dgp Exp $
 '\" 
 .so man.macros
 .TH "tcltest" n 2.1 tcltest "Tcl Bundled Packages"
@@ -151,8 +151,10 @@ to be tested to the interpreter running the test suite.
 Create a file named \fIname\fR relative to
 directory \fIdirectory\fR and write \fIcontents\fR
 to that file using the encoding [\fBencoding system\fR].
-Because the system encoding is used, this command
-is only suitable for making text files.
+If \fIcontents\fR does not end with a newline, a newline
+will be appended so that the file named \fIname\fR
+does end in a newline.  Because the system encoding is used,
+this command is only suitable for making text files.
 The file will will be removed by the next evaluation
 of [\fBcleanupTests\fR], unless it is removed by
 [\fBremoveFile\fR] first.  The default value of
@@ -187,14 +189,16 @@ Returns an empty string.  Use this command to delete any directories
 created by [\fBmakeDirectory\fR].  
 .TP
 \fBviewFile\fR \fIfile ?directory?\fR
-Returns the contents of \fIfile\fR.  This file name
-should be relative to \fIdirectory\fR.   The default value of
-\fIdirectory\fR is the directory specified by
+Returns the contents of \fIfile\fR, except for any
+final newline, just as [\fBread -nonewline\fR] would return.
+This file name should be relative to \fIdirectory\fR.   
+The default value of \fIdirectory\fR is the directory specified by
 the \fB-tmpdir\fR option to [\fBconfigure\fR].  Use this command
 as a convenient way to turn the contents of a file generated
 by a test into the result of that test for matching against
 an expected result.  The contents of the file are read using
-the binary encoding, so the exact byte for byte contents are returned.
+the binary encoding, so the exact byte for byte contents are
+returned, with the execption of the final newline, if any.
 .TP
 \fBcleanupTests\fR
 Intended to clean up and summarize after several tests have been
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 2794a6e..6871ab9 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -16,7 +16,7 @@
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 #
-# RCS: @(#) $Id: tcltest.tcl,v 1.65 2002/07/02 13:28:51 dgp Exp $
+# RCS: @(#) $Id: tcltest.tcl,v 1.66 2002/07/02 19:10:57 dgp Exp $
 
 package require Tcl 8.3		;# uses [glob -directory]
 namespace eval tcltest {
@@ -1342,7 +1342,7 @@ proc tcltest::ProcessFlags {flagArray} {
 	    # Check whether the problem is "unknown option"
 	    if {[regexp {^unknown option (\S+):} $msg -> option]} {
 		# Could be this is an option the Hook knows about
-		set moreOptions [processCmdLineArgsAddFlagHook]
+		set moreOptions [processCmdLineArgsAddFlagsHook]
 		if {[lsearch -exact $moreOptions $option] == -1} {
 		    # Nope.  Report the error, including additional options,
 		    # but keep going
@@ -2897,7 +2897,11 @@ proc tcltest::makeFile {contents name {directory ""}} {
 
     set fd [open $fullName w]
     fconfigure $fd -translation lf
-    puts -nonewline $fd $contents
+    if {[string equal [string index $contents end] \n]} {
+	puts -nonewline $fd $contents
+    } else {
+	puts $fd $contents
+    }
     close $fd
 
     if {[lsearch -exact $filesMade $fullName] == -1} {
@@ -3037,7 +3041,7 @@ proc tcltest::viewFile {name {directory ""}} {
     set fullName [file join $directory $name]
     set f [open $fullName]
     fconfigure $f -translation binary
-    set data [read $f]
+    set data [read -nonewline $f]
     close $f
     return $data
 }
@@ -3284,7 +3288,7 @@ namespace eval tcltest {
 	    set required true
 	}
 	foreach hook { PrintUsageInfoHook processCmdLineArgsHook
-			processCmdLineArgsAddFlagHook } {
+			processCmdLineArgsAddFlagsHook } {
 	    if {[string equal [namespace current] [namespace qualifiers \
 		    [namespace which $hook]]]} {
 		set required true
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 2c0b91c..2734b24 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.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: cmdAH.test,v 1.24 2002/07/01 14:35:10 dgp Exp $
+# RCS: @(#) $Id: cmdAH.test,v 1.25 2002/07/02 19:10:57 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.1
@@ -1434,7 +1434,7 @@ test cmdAH-28.4 {Tcl_FileObjCmd: stat} {
     catch {unset stat}
     file stat gorp.file stat
     list $stat(nlink) $stat(size) $stat(type)
-} {1 11 file}
+} {1 12 file}
 test cmdAH-28.5 {Tcl_FileObjCmd: stat} {unixOnly} {
     catch {unset stat}
     file stat gorp.file stat
diff --git a/tests/event.test b/tests/event.test
index 9fa905d..927a5d8 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -9,10 +9,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: event.test,v 1.17 2002/07/01 02:29:22 dgp Exp $
+# RCS: @(#) $Id: event.test,v 1.18 2002/07/02 19:10:57 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest 2.1
+    package require tcltest 2
     namespace import -force ::tcltest::*
 }
 
@@ -217,7 +217,8 @@ test event-6.1 {BgErrorDeleteProc procedure} {
     close $f
     removeFile err.out
     set result
-} {Unmodified}
+} {Unmodified
+}
 
 test event-7.1 {bgerror / regular} {
     set errRes {}
diff --git a/tests/http.test b/tests/http.test
index fe76873..04e3781 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -12,10 +12,10 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.27 2002/07/01 02:29:22 dgp Exp $
+# RCS: @(#) $Id: http.test,v 1.28 2002/07/02 19:10:57 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest 2.1
+    package require tcltest 2
     namespace import -force ::tcltest::*
 }
 
@@ -246,7 +246,7 @@ test http-3.11 {http::geturl querychannel with -command} {
     lappend testRes [http::status $t] $postResult
     removeFile outdata
     set testRes
-} {ok 122879 {Got 122879 bytes} ok {PostStart {Got 122879 bytes}}}
+} {ok 122879 {Got 122880 bytes} ok {PostStart {Got 122880 bytes}}}
 
 # On Linux platforms when the client and server are on the same
 # host, the client is unable to read the server's response one
diff --git a/tests/io.test b/tests/io.test
index bf5e770..8ad3436 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -12,10 +12,10 @@
 # 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.33 2002/07/01 14:35:10 dgp Exp $
+# RCS: @(#) $Id: io.test,v 1.34 2002/07/02 19:10:57 dgp Exp $
 
-if {[catch {package require tcltest 2.1}]} {
-    puts stderr "Skipping tests in [info script].  tcltest 2.1 required."
+if {[catch {package require tcltest 2}]} {
+    puts stderr "Skipping tests in [info script].  tcltest 2 required."
     return
 }
 namespace eval ::tcl::test::io {
@@ -34,10 +34,12 @@ testConstraint testchannel [llength [info commands testchannel]]
 # particular, many file systems do not support large-files...
 testConstraint largefileSupport 0
 
+removeFile test1
+removeFile pipe
+
 # set up a long data file for some of the following tests
 
-set longfile [makeFile {} longfile]
-set f [open $longfile w]
+set f [open longfile w]
 fconfigure $f -eofchar {} -translation lf
 for { set i 0 } { $i < 100 } { incr i} {
     puts $f "#123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
@@ -67,153 +69,140 @@ makeFile {
 
 set thisScript [file join [pwd] [info script]]
 
+proc contents {file} {
+    set f [open $file]
+    fconfigure $f -translation binary
+    set a [read $f]
+    close $f
+    return $a
+}
+
 test io-1.5 {Tcl_WriteChars: CheckChannelErrors} {emptyTest} {
     # no test, need to cause an async error.
 } {}
-test io-1.6 {Tcl_WriteChars: WriteBytes} -body {
-    set f [open [makeFile {} test1] w]
+test io-1.6 {Tcl_WriteChars: WriteBytes} {
+    set f [open test1 w]
     fconfigure $f -encoding binary
     puts -nonewline $f "a\u4e4d\0"
     close $f
-    viewFile test1
-} -cleanup {
-    removeFile test1
-} -result "a\x4d\x00"
-test io-1.7 {Tcl_WriteChars: WriteChars} -body {
-    set f [open [makeFile {} test1] w]
+    contents test1
+} "a\x4d\x00"
+test io-1.7 {Tcl_WriteChars: WriteChars} {
+    set f [open test1 w]
     fconfigure $f -encoding shiftjis
     puts -nonewline $f "a\u4e4d\0"
     close $f
-    viewFile test1
-} -cleanup {
-    removeFile test1
-} -result "a\x93\xe1\x00"
-test io-1.8 {Tcl_WriteChars: WriteChars} -body {
+    contents test1
+} "a\x93\xe1\x00"
+test io-1.8 {Tcl_WriteChars: WriteChars} {
     # This test written for SF bug #506297.
     #
     # Executing this test without the fix for the referenced bug
     # applied to tcl will cause tcl, more specifically WriteChars, to
     # go into an infinite loop.
 
-    set f [open [makeFile {} test2] w] 
+    set f [open test2 w] 
     fconfigure      $f -encoding iso2022-jp 
     puts -nonewline $f [format %s%c [string repeat " " 4] 12399] 
     close           $f 
-    viewFile test2
-} -cleanup {
-    removeFile test2
-} -result "    \x1b\$B\$O\x1b(B"
+    contents test2
+} "    \x1b\$B\$O\x1b(B"
 
-test io-2.1 {WriteBytes} -body {
+test io-2.1 {WriteBytes} {
     # loop until all bytes are written
-    set f [open [makeFile {} test1] w]
+    
+    set f [open test1 w]
     fconfigure $f  -encoding binary -buffersize 16 -translation crlf
     puts $f "abcdefghijklmnopqrstuvwxyz"
     close $f
-    viewFile test1
-} -cleanup {
-    removeFile test1
-} -result "abcdefghijklmnopqrstuvwxyz\r\n"
+    contents test1
+} "abcdefghijklmnopqrstuvwxyz\r\n"
 test io-2.2 {WriteBytes: savedLF > 0} {
     # After flushing buffer, there was a \n left over from the last
     # \n -> \r\n expansion.  It gets stuck at beginning of this buffer.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding binary -buffersize 16 -translation crlf
     puts -nonewline $f "123456789012345\n12"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "123456789012345\r" "123456789012345\r\n12"]
 test io-2.3 {WriteBytes: flush on line} {
     # Tcl "line" buffering has weird behavior: if current buffer contains
     # a \n, entire buffer gets flushed.  Logical behavior would be to flush
     # only up to the \n.
     
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding binary -buffering line -translation crlf
     puts -nonewline $f "\n12"
-    set x [viewFile test1]
+    set x [contents test1]
     close $f
-    removeFile test1
     set x
 } "\r\n12"
 test io-2.4 {WriteBytes: reset sawLF after each buffer} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
      fconfigure $f -encoding binary -buffering line -translation lf \
 	     -buffersize 16
     puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
 
-test io-3.1 {WriteChars: compatibility with WriteBytes} -body {
+test io-3.1 {WriteChars: compatibility with WriteBytes} {
     # loop until all bytes are written
     
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding ascii -buffersize 16 -translation crlf
     puts $f "abcdefghijklmnopqrstuvwxyz"
     close $f
-    viewFile test1
-} -cleanup {
-    removeFile test1
-} -result "abcdefghijklmnopqrstuvwxyz\r\n"
+    contents test1
+} "abcdefghijklmnopqrstuvwxyz\r\n"
 test io-3.2 {WriteChars: compatibility with WriteBytes: savedLF > 0} {
     # After flushing buffer, there was a \n left over from the last
     # \n -> \r\n expansion.  It gets stuck at beginning of this buffer.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding ascii -buffersize 16 -translation crlf
     puts -nonewline $f "123456789012345\n12"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "123456789012345\r" "123456789012345\r\n12"]
 test io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} {
     # Tcl "line" buffering has weird behavior: if current buffer contains
     # a \n, entire buffer gets flushed.  Logical behavior would be to flush
     # only up to the \n.
     
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding ascii -buffering line -translation crlf
     puts -nonewline $f "\n12"
-    set x [viewFile test1]
+    set x [contents test1]
     close $f
-    removeFile test1
     set x
 } "\r\n12"
 test io-3.4 {WriteChars: loop over stage buffer} {
     # stage buffer maps to more than can be queued at once.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding jis0208 -buffersize 16 
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "!)!)!)!)!)!)!)!)" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
 test io-3.5 {WriteChars: saved != 0} {
     # Bytes produced by UtfToExternal from end of last channel buffer
     # had to be moved to beginning of next channel buffer to preserve
     # requested buffersize.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding jis0208 -buffersize 17 
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
 test io-3.6 {WriteChars: (stageRead + dstWrote == 0)} {
     # One incomplete UTF-8 character at end of staging buffer.  Backup
@@ -225,14 +214,12 @@ test io-3.6 {WriteChars: (stageRead + dstWrote == 0)} {
     # to outer loop where those two bytes will have the remaining 4 bytes
     # (the last byte of \uff21 plus the all of \uff22) appended.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding shiftjis -buffersize 16
     puts -nonewline $f "12345678901234\uff21\uff22"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "12345678901234\x82\x60" "12345678901234\x82\x60\x82\x61"]
 test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
     # When translating UTF-8 to external, the produced bytes went past end
@@ -241,149 +228,123 @@ test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
     # blocksize on flush.  The truncated bytes are moved to the beginning
     # of the next channel buffer.
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding jis0208 -buffersize 17 
     puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
 test io-3.8 {WriteChars: reset sawLF after each buffer} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -encoding ascii -buffering line -translation lf \
 	     -buffersize 16
     puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
 
 test io-4.1 {TranslateOutputEOL: lf} {
     # search for \n
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering line -translation lf
     puts $f "abcde"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "abcde\n" "abcde\n"]
 test io-4.2 {TranslateOutputEOL: cr} {
     # search for \n, replace with \r
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering line -translation cr
     puts $f "abcde"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "abcde\r" "abcde\r"]
 test io-4.3 {TranslateOutputEOL: crlf} {
     # simple case: search for \n, replace with \r
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering line -translation crlf
     puts $f "abcde"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "abcde\r\n" "abcde\r\n"]
 test io-4.4 {TranslateOutputEOL: crlf} {
     # keep storing more bytes in output buffer until output buffer is full.
     # We have 13 bytes initially that would turn into 18 bytes.  Fill
     # dest buffer while (dstEnd < dstMax).
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -translation crlf -buffersize 16
     puts -nonewline $f "1234567\n\n\n\n\nA"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "1234567\r\n\r\n\r\n\r\n\r" "1234567\r\n\r\n\r\n\r\n\r\nA"]
 test io-4.5 {TranslateOutputEOL: crlf} {
     # Check for overflow of the destination buffer
 
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -translation crlf -buffersize 12
     puts -nonewline $f "12345678901\n456789012345678901234"
     close $f
-    set x [viewFile test1]
-    removeFile test1
-    set x
+    set x [contents test1]
 } "12345678901\r\n456789012345678901234"
 
 test io-5.1 {CheckFlush: not full} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f 
     puts -nonewline $f "12345678901234567890"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "" "12345678901234567890"]
 test io-5.2 {CheckFlush: full} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffersize 16
     puts -nonewline $f "12345678901234567890"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "1234567890123456" "12345678901234567890"]
 test io-5.3 {CheckFlush: not line} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering line
     puts -nonewline $f "12345678901234567890"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "" "12345678901234567890"]
 test io-5.4 {CheckFlush: line} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering line -translation lf -encoding ascii
     puts -nonewline $f "1234567890\n1234567890"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "1234567890\n1234567890" "1234567890\n1234567890"]
 test io-5.5 {CheckFlush: none} {
-    set f [open [makeFile {} test1] w]
+    set f [open test1 w]
     fconfigure $f -buffering none
     puts -nonewline $f "1234567890"
-    set x [list [viewFile test1]]
+    set x [list [contents test1]]
     close $f
-    lappend x [viewFile test1]
-    removeFile test1
-    set x
+    lappend x [contents test1]
 } [list "1234567890" "1234567890"]
 
 test io-6.1 {Tcl_GetsObj: working} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts $f "foo\nboo"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [gets $f]
     close $f
-    removeFile test1
     set x
 } {foo}
 test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} {
@@ -392,41 +353,35 @@ test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} {
 test io-6.3 {Tcl_GetsObj: how many have we used?} {
     # if (bufPtr != NULL) {oldRemoved = bufPtr->nextRemoved}
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f "abc\ndefg"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [tell $f] [gets $f line] [tell $f] [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {0 3 5 4 defg}
 test io-6.4 {Tcl_GetsObj: encoding == NULL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation binary
     puts $f "\x81\u1234\0"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation binary
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 3 "\x81\x34\x00"]
 test io-6.5 {Tcl_GetsObj: encoding != NULL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation binary
     puts $f "\x88\xea\x92\x9a"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding shiftjis
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 2 "\u4e00\u4e01"]
 set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
@@ -435,15 +390,13 @@ append a $a
 test io-6.6 {Tcl_GetsObj: loop test} {
     # if (dst >= dstEnd) 
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts $f $a
     puts $f hi
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 256 $a]
 test io-6.7 {Tcl_GetsObj: error in input} {stdio} {
@@ -459,299 +412,253 @@ test io-6.7 {Tcl_GetsObj: error in input} {stdio} {
     set x
 } {-1}
 test io-6.8 {Tcl_GetsObj: remember if EOF is seen} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts $f "abcdef\x1aghijk\nwombat"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -eofchar \x1a
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {6 abcdef -1 {}}
 test io-6.9 {Tcl_GetsObj: remember if EOF is seen} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts $f "abcdefghijk\nwom\u001abat"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -eofchar \x1a
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {11 abcdefghijk 3 wom}
 
 # Comprehensive tests
 
 test io-6.10 {Tcl_GetsObj: lf mode: no chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {-1 {}}
 test io-6.11 {Tcl_GetsObj: lf mode: lone \n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {0 {} -1 {}}
 test io-6.12 {Tcl_GetsObj: lf mode: lone \r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 1 "\r" -1 ""]
 test io-6.13 {Tcl_GetsObj: lf mode: 1 char} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f a
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.14 {Tcl_GetsObj: lf mode: 1 char followed by EOL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.15 {Tcl_GetsObj: lf mode: several chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation lf
     set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 4 "abcd" 10 "efgh\rijkl\r" 4 "mnop" -1 ""]
 test io-6.16 {Tcl_GetsObj: cr mode: no chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {-1 {}}
 test io-6.17 {Tcl_GetsObj: cr mode: lone \n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 1 "\n" -1 ""]
 test io-6.18 {Tcl_GetsObj: cr mode: lone \r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {0 {} -1 {}}
 test io-6.19 {Tcl_GetsObj: cr mode: 1 char} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f a
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.20 {Tcl_GetsObj: cr mode: 1 char followed by EOL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.21 {Tcl_GetsObj: cr mode: several chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 9 "abcd\nefgh" 4 "ijkl" 5 "\nmnop" -1 ""]
 test io-6.22 {Tcl_GetsObj: crlf mode: no chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {-1 {}}
 test io-6.23 {Tcl_GetsObj: crlf mode: lone \n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 1 "\n" -1 ""]
 test io-6.24 {Tcl_GetsObj: crlf mode: lone \r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 1 "\r" -1 ""]
 test io-6.25 {Tcl_GetsObj: crlf mode: \r\r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 2 "\r\r" -1 ""]
 test io-6.26 {Tcl_GetsObj: crlf mode: \r\n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 0 "" -1 ""]
 test io-6.27 {Tcl_GetsObj: crlf mode: 1 char} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f a
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.28 {Tcl_GetsObj: crlf mode: 1 char followed by EOL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.29 {Tcl_GetsObj: crlf mode: several chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 14 "abcd\nefgh\rijkl" 4 "mnop" -1 ""]
 test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} {testchannel} {
     # if (eol >= dstEnd)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r\nabcdefghijklmnoprstuvwxyz"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf -buffersize 16
     set x [list [gets $f line] $line [testchannel inputbuffered $f]]
     close $f
-    removeFile test1
     set x
 } [list 15 "123456789012345" 15]
 test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio testchannel} {
@@ -770,149 +677,127 @@ test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio testchan
 test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} {testchannel} {
     # not (FilterInputBytes() != 0)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r\n123"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf -buffersize 16
     set x [list [gets $f line] $line [tell $f] [testchannel inputbuffered $f]]
     close $f
-    removeFile test1
     set x
 } [list 15 "123456789012345" 17 3]
 test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} {
     # eol still equals dstEnd
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf -buffersize 16
     set x [list [gets $f line] $line [eof $f]]
     close $f
-    removeFile test1
     set x
 } [list 16 "123456789012345\r" 1]
 test io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} {
     # not (*eol == '\n') 
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\rabcd\r\nefg"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf -buffersize 16
     set x [list [gets $f line] $line [tell $f]]
     close $f
-    removeFile test1
     set x
 } [list 20 "123456789012345\rabcd" 22]
 test io-6.35 {Tcl_GetsObj: auto mode: no chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {-1 {}}
 test io-6.36 {Tcl_GetsObj: auto mode: lone \n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 0 "" -1 ""]
 test io-6.37 {Tcl_GetsObj: auto mode: lone \r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 0 "" -1 ""]
 test io-6.38 {Tcl_GetsObj: auto mode: \r\r} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 0 "" 0 "" -1 ""]
 test io-6.39 {Tcl_GetsObj: auto mode: \r\n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 0 "" -1 ""]
 test io-6.40 {Tcl_GetsObj: auto mode: 1 char} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f a
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.41 {Tcl_GetsObj: auto mode: 1 char followed by EOL} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } {1 a -1 {}}
 test io-6.42 {Tcl_GetsObj: auto mode: several chars} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [gets $f line] $line [gets $f line] $line]
     lappend x [gets $f line] $line [gets $f line] $line [gets $f line] $line
     close $f
-    removeFile test1
     set x
 } [list 4 "abcd" 4 "efgh" 4 "ijkl" 4 "mnop" -1 ""]
 test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel} {
@@ -985,128 +870,110 @@ test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {s
 test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} {testchannel} {
     # (eol == dstEnd)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r\nabcdefghijklmnopq"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto -buffersize 16
     set x [list [gets $f] [testchannel inputbuffered $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456789012345" 15]    
 test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} {testchannel} {
     # PeekAhead() did not get any, so (eol >= dstEnd)
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456789012345\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto -buffersize 16
     set x [list [gets $f] [testchannel queuedcr $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456789012345" 1]
 test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} {testchannel} {
     # if (*eol == '\n') {skip++}
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\r\n78901"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456" 0 8 "78901"]
 test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} {testchannel} {
     # not (*eol == '\n') 
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\r78901"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456" 0 7 "78901"]
 test io-6.51 {Tcl_GetsObj: auto mode: \n} {
     # else if (*eol == '\n') {goto gotoeol;}
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\n78901"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f] [tell $f] [gets $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456" 7 "78901"]
 test io-6.52 {Tcl_GetsObj: saw EOF character} {testchannel} {
     # if (eof != NULL)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "123456\x1ak9012345\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -eofchar \x1a
     set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
     close $f
-    removeFile test1
     set x
 } [list "123456" 0 6 ""]
 test io-6.53 {Tcl_GetsObj: device EOF} {
     # didn't produce any bytes
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f line] $line [eof $f]]
     close $f
-    removeFile test1
     set x
 } {-1 {} 1}
 test io-6.54 {Tcl_GetsObj: device EOF} {
     # got some bytes before EOF.
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts -nonewline $f abc
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [gets $f line] $line [eof $f]]
     close $f
-    removeFile test1
     set x
 } {3 abc 1}
 test io-6.55 {Tcl_GetsObj: overconverted} {
     # Tcl_ExternalToUtf(), make sure state updated
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -encoding iso2022-jp
     puts $f "there\u4e00ok\n\u4e01more bytes\nhere"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding iso2022-jp
     set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
     close $f
-    removeFile test1
     set x
 } [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"]
 test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} {
@@ -1133,46 +1000,40 @@ test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio}
 test io-7.1 {FilterInputBytes: split up character at end of buffer} {
     # (result == TCL_CONVERT_MULTIBYTE)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -encoding shiftjis
     puts $f "1234567890123\uff10\uff11\uff12\uff13\uff14\nend"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding shiftjis -buffersize 16
     set x [gets $f]
     close $f
-    removeFile test1
     set x
 } "1234567890123\uff10\uff11\uff12\uff13\uff14"
 test io-7.2 {FilterInputBytes: split up character in middle of buffer} {
     # (bufPtr->nextAdded < bufPtr->bufLength)
     
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -encoding binary
     puts -nonewline $f "1234567890\n123\x82\x4f\x82\x50\x82"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding shiftjis
     set x [list [gets $f line] $line [eof $f]]
     close $f
-    removeFile test1
     set x
 } [list 10 "1234567890" 0]
 test io-7.3 {FilterInputBytes: split up character at EOF} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -encoding binary
     puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding shiftjis
     set x [list [gets $f line] $line]
     lappend x [tell $f] [testchannel inputbuffered $f] [eof $f]
     lappend x [gets $f line] $line
     close $f
-    removeFile test1
     set x
 } [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""]
 test io-7.4 {FilterInputBytes: recover from split up character} {stdio} {
@@ -1198,18 +1059,16 @@ test io-7.4 {FilterInputBytes: recover from split up character} {stdio} {
 test io-8.1 {PeekAhead: only go to device if no more cached data} {testchannel} {
     # (bufPtr->nextPtr == NULL)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     fconfigure $f -encoding ascii -translation lf
     puts -nonewline $f "123456789012345\r\n2345678"
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -encoding ascii -translation auto -buffersize 16
     # here
     gets $f
     set x [testchannel inputbuffered $f]
     close $f
-    removeFile test1
     set x
 } "7"
 test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio testchannel} {
@@ -1249,12 +1108,11 @@ append a "1234567890123456789012345678901"
 test io-8.4 {PeekAhead: cached data available in this buffer} {
     # not (bytesLeft == 0)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w+]
+    set f [open test1 w+]
     fconfigure $f -translation binary
     puts $f "${a}\r\nabcdef"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -encoding binary -translation auto
 
     # "${a}\r" was converted in one operation (because ENCODING_LINESIZE
@@ -1263,7 +1121,6 @@ test io-8.4 {PeekAhead: cached data available in this buffer} {
 
     set x [gets $f]
     close $f
-    removeFile test1
     set x    
 } $a
 unset a
@@ -1316,167 +1173,145 @@ test io-10.2 {Tcl_ReadChars: loop until enough copied} {
     # one time
     # for (copied = 0; (unsigned) toRead > 0; )
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts $f abcdefghijklmnop
     close $f
 
-    set f [open $test1]
+    set f [open "test1"]
     set x [read $f 5]
     close $f
-    removeFile test1
     set x
 } {abcde}
 test io-10.3 {Tcl_ReadChars: loop until enough copied} {
     # multiple times
     # for (copied = 0; (unsigned) toRead > 0; )
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts $f abcdefghijklmnopqrstuvwxyz
     close $f
 
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -buffersize 16
     # here
     set x [read $f 19]
     close $f
-    removeFile test1
     set x
 } {abcdefghijklmnopqrs}
 test io-10.4 {Tcl_ReadChars: no more in channel buffer} {
     # (copiedNow < 0)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
 
-    set f [open $test1]
+    set f [open "test1"]
     # here
     set x [read $f 1000]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 test io-10.5 {Tcl_ReadChars: stop on EOF} {
     # (chanPtr->flags & CHANNEL_EOF)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
 
-    set f [open $test1]
+    set f [open "test1"]
     # here
     set x [read $f 1000]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 
 test io-11.1 {ReadBytes: want to read a lot} {
     # ((unsigned) toRead > (unsigned) srcLen)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -encoding binary
     # here
     set x [read $f 1000]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 test io-11.2 {ReadBytes: want to read all} {
     # ((unsigned) toRead > (unsigned) srcLen)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -encoding binary
     # here
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 test io-11.3 {ReadBytes: allocate more space} {
     # (toRead > length - offset - 1)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijklmnopqrstuvwxyz
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -buffersize 16 -encoding binary
     # here
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } {abcdefghijklmnopqrstuvwxyz}
 test io-11.4 {ReadBytes: EOF char found} {
     # (TranslateInputEOL() != 0)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts $f abcdefghijklmnopqrstuvwxyz
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -eofchar m -encoding binary
     # here
     set x [list [read $f] [eof $f] [read $f] [eof $f]]
     close $f
-    removeFile test1
     set x
 } [list "abcdefghijkl" 1 "" 1]
     
 test io-12.1 {ReadChars: want to read a lot} {
     # ((unsigned) toRead > (unsigned) srcLen)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     # here
     set x [read $f 1000]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 test io-12.2 {ReadChars: want to read all} {
     # ((unsigned) toRead > (unsigned) srcLen)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijkl
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     # here
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } {abcdefghijkl}
 test io-12.3 {ReadChars: allocate more space} {
     # (toRead > length - offset - 1)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open "test1" w]
     puts -nonewline $f abcdefghijklmnopqrstuvwxyz
     close $f
-    set f [open $test1]
+    set f [open "test1"]
     fconfigure $f -buffersize 16
     # here
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } {abcdefghijklmnopqrstuvwxyz}
 test io-12.4 {ReadChars: split-up char} {stdio testchannel} {
@@ -1505,13 +1340,13 @@ test io-12.4 {ReadChars: split-up char} {stdio testchannel} {
     set x
 } [list "123456789012345" 1 "\u672c" 0]
 test io-12.5 {ReadChars: fileevents on partial characters} {stdio} {
-    set test1 [makeFile {
+    makeFile {
 	fconfigure stdout -encoding binary -buffering none
 	gets stdin; puts -nonewline "\xe7"
 	gets stdin; puts -nonewline "\x89"
 	gets stdin; puts -nonewline "\xa6"
-    } test1]
-    set f [open "|[list [interpreter] $test1]" r+]
+    } test1
+    set f [open "|[list [interpreter] test1]" r+]
     fileevent $f readable [namespace code {
 	lappend x [read $f]
 	if {[eof $f]} {
@@ -1535,79 +1370,68 @@ test io-12.5 {ReadChars: fileevents on partial characters} {stdio} {
     vwait [namespace which -variable x]
     vwait [namespace which -variable x]
     lappend x [catch {close $f} msg] $msg
-    removeFile test1
     set x
 } "{} timeout {} timeout \u7266 {} eof 0 {}"
 
 test io-13.1 {TranslateInputEOL: cr mode} {} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\rdef\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation cr
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef\n"
 test io-13.2 {TranslateInputEOL: crlf mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r\ndef\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef\n"
 test io-13.3 {TranslateInputEOL: crlf mode: naked cr} {
     # (src >= srcMax) 
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r\ndef\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef\r"
 test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} {
     # (src >= srcMax) 
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r\ndef\rfgh"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [read $f]
-    removeFile test1
     close $f
     set x
 } "abcd\ndef\rfgh"
 test io-13.5 {TranslateInputEOL: crlf mode: naked lf} {
     # (src >= srcMax) 
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r\ndef\nfgh"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef\nfgh"
 test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testchannel} {
@@ -1639,89 +1463,77 @@ test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testc
 test io-13.7 {TranslateInputEOL: auto mode: naked \r} {testchannel} {
     # (src >= srcMax)
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [list [read $f] [testchannel queuedcr $f]]
     close $f
-    removeFile test1
     set x
 } [list "abcd\n" 1]
 test io-13.8 {TranslateInputEOL: auto mode: \r\n} {
     # (*src == '\n')
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\r\ndef"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef"
 test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\rdef"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef"
 test io-13.10 {TranslateInputEOL: auto mode: \n} {
     # not (*src == '\r') 
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\ndef"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\ndef"
 test io-13.11 {TranslateInputEOL: EOF char} {
     # (*chanPtr->inEofChar != '\0')
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "abcd\ndefgh"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto -eofchar e
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "abcd\nd"
 test io-13.12 {TranslateInputEOL: find EOF char in src} {
     # (*chanPtr->inEofChar != '\0')
 
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "\r\n\r\n\r\nab\r\n\r\ndef\r\n\r\n\r\n"
     close $f
-    set f [open $test1]
+    set f [open test1]
     fconfigure $f -translation auto -eofchar e
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "\n\n\nab\n\nd"
     
@@ -1758,31 +1570,28 @@ test io-14.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} {
     set l
 } {line line none}
 test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {stdio} {
-    set test2 [makeFile {} test2]
-    set test3 [makeFile {} test3]
-    set test1 [makeFile {
+    set f [open test1 w]
+    puts $f {
 	close stdin
 	close stdout
 	close stderr
-	set f [open [file join [file dirname [info script]] test1] r]
-	set f2 [open [file join [file dirname [info script]] test2] w]
-	set f3 [open [file join [file dirname [info script]] test3] w]
+	set f [open test1 r]
+	set f2 [open test2 w]
+	set f3 [open test3 w]
 	puts stdout [gets stdin]
 	puts stdout out
 	puts stderr err
 	close $f
 	close $f2
 	close $f3
-    } test1]
-    set result [exec [interpreter] $test1]
-    set f [open $test2 r]
-    set f2 [open $test3 r]
+    }
+    close $f
+    set result [exec [interpreter] test1]
+    set f [open test2 r]
+    set f2 [open test3 r]
     lappend result [read $f] [read $f2]
     close $f
     close $f2
-    removeFile test3
-    removeFile test2
-    removeFile test1
     set result
 } {{
 out
@@ -1790,30 +1599,27 @@ out
 }}
 # This test relies on the fact that the smallest available fd is used first.
 test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {unixOnly} {
-    set test2 [makeFile {} test2]
-    set test3 [makeFile {} test3]
-    set test1 [makeFile { close stdin
+    set f [open test1 w]
+    puts $f { close stdin
 	close stdout
 	close stderr
-	set f [open [file join [file dirname [info script]] test1] r]
-	set f2 [open [file join [file dirname [info script]] test2] w]
-	set f3 [open [file join [file dirname [info script]] test3] w]
+	set f [open test1 r]
+	set f2 [open test2 w]
+	set f3 [open test3 w]
 	puts stdout [gets stdin]
 	puts stdout $f2
 	puts stderr $f3
 	close $f
 	close $f2
 	close $f3
-    } test1]
-    set result [exec [interpreter] $test1]
-    set f [open $test2 r]
-    set f2 [open $test3 r]
+    }
+    close $f
+    set result [exec [interpreter] test1]
+    set f [open test2 r]
+    set f2 [open test3 r]
     lappend result [read $f] [read $f2]
     close $f
     close $f2
-    removeFile test3
-    removeFile test2
-    removeFile test1
     set result
 } {{ close stdin
 file1
@@ -1851,37 +1657,39 @@ test io-14.7 {Tcl_GetChannel: stdio name translation} {
     set result
 } {{} {} {can not find channel named "stderr"}}
 test io-14.8 {reuse of stdio special channels} {stdio} {
-    makeFile {} test1
-    set script [makeFile {
+    removeFile script
+    removeFile test1
+    set f [open script w]
+    puts $f {
 	close stderr
-	set f [open [file join [file dirname [info script]] test1] w]
+	set f [open test1 w]
 	puts stderr hello
 	close $f
-	set f [open [file join [file dirname [info script]] test1] r]
+	set f [open test1 r]
 	puts [gets $f]
-    } script]
-    set f [open "|[list [interpreter] $script]" r]
+    }
+    close $f
+    set f [open "|[list [interpreter] script]" r]
     set c [gets $f]
     close $f
-    removeFile test1
-    removeFile script
     set c
 } hello
 test io-14.9 {reuse of stdio special channels} {stdio} {
-    makeFile {} test1
-    set script [makeFile {
-	set test1 [file join [file dirname [info script]] test1]
-	set f [open $test1 w]
+    removeFile script
+    removeFile test1
+    set f [open script w]
+    puts $f {
+	set f [open test1 w]
 	puts $f hello
 	close $f
 	close stderr
-	set f [open "|[list [info nameofexecutable] cat $test1]" r]
+	set f [open "|[list [info nameofexecutable] cat test1]" r]
 	puts [gets $f]
-    } script]
-    set f [open "|[list [interpreter] $script]" r]
+    }
+    close $f
+    set f [open "|[list [interpreter] script]" r]
     set c [gets $f]
     close $f
-    removeFile script
     set c
 } hello
 
@@ -1936,9 +1744,9 @@ test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} {testchannel}
 } {0 1 0}
 
 test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
+    removeFile test1
     set l ""
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     lappend l [lindex [testchannel info $f] 15]
     close $f
     if {[catch {lindex [testchannel info $f] 15} msg]} {
@@ -1946,14 +1754,13 @@ test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
     } else {
 	lappend l "very broken: $f found after being closed"
     }
-    removeFile test1
     string compare [string tolower $l] \
 	[list 1 [format "can not find channel named \"%s\"" $f]]
 } 0
 test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
+    removeFile test1
     set l ""
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     lappend l [lindex [testchannel info $f] 15]
     interp create x
     interp share "" $f x
@@ -1968,14 +1775,13 @@ test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
     } else {
 	lappend l "very broken: $f found after being closed"
     }
-    removeFile test1
     string compare [string tolower $l] \
 	[list 1 2 1 1 [format "can not find channel named \"%s\"" $f]]
 } 0
 test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
+    removeFile test1
     set l ""
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     lappend l [lindex [testchannel info $f] 15]
     interp create x
     interp share "" $f x
@@ -1988,7 +1794,6 @@ test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} {
     } else {
 	lappend l "very broken: $f found after being closed"
     }
-    removeFile test1
     string compare [string tolower $l] \
 	[list 1 2 1 [format "can not find channel named \"%s\"" $f]]
 } 0
@@ -1997,19 +1802,18 @@ test io-19.1 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} {
     eof stdin
 } 0
 test io-19.2 {testing Tcl_GetChannel, user opened handle} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     set x [eof $f]
     close $f
-    removeFile test1
     set x
 } 0
 test io-19.3 {Tcl_GetChannel, channel not found} {
     list [catch {eof file34} msg] $msg
 } {1 {can not find channel named "file34"}}
 test io-19.4 {Tcl_CreateChannel, insertion into channel table} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     set l ""
     lappend l [eof $f]
     close $f
@@ -2018,62 +1822,50 @@ test io-19.4 {Tcl_CreateChannel, insertion into channel table} {testchannel} {
     } else {
 	lappend l "very broken: $f found after being closed"
     }
-    removeFile test1
     string compare [string tolower $l] \
 	[list 0 [format "can not find channel named \"%s\"" $f]]
 } 0
 
 test io-20.1 {Tcl_CreateChannel: initial settings} {
-    set test2 [makeFile {} test2]
-    set a [open $test2 w]
+	set a [open test2 w]
     set old [encoding system]
     encoding system ascii
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     set x [fconfigure $f -encoding]
     close $f
     encoding system $old
-    close $a
-    removeFile test1
-    removeFile test2
+	close $a
     set x
 } {ascii}    
 test io-20.2 {Tcl_CreateChannel: initial settings} {pcOnly} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w+]
+    set f [open test1 w+]
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
-    removeFile test1
     set x
 } [list [list \x1a ""] {auto crlf}]
 test io-20.3 {Tcl_CreateChannel: initial settings} {unixOnly} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w+]
+    set f [open test1 w+]
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
-    removeFile test1
     set x
 } {{{} {}} {auto lf}}
 test io-20.4 {Tcl_CreateChannel: initial settings} {macOnly} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w+]
+    set f [open test1 w+]
     set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
     close $f
-    removeFile test1
     set x
 } {{{} {}} {auto cr}}
 test io-20.5 {Tcl_CreateChannel: install channel in empty slot} {stdio} {
-    set stdout [makeFile {} stdout]
-    set script [makeFile {
+    set f [open script w]
+    puts $f {
 	close stdout
-	set f1 [open [file join [file dirname [info script]] stdout] w]
+	set f1 [open stdout w]
 	fconfigure $f1 -buffersize 777
 	puts stderr [fconfigure stdout -buffersize]
-    } script]
-    set f [open "|[list [interpreter] $script]"]
+    }
+    close $f
+    set f [open "|[list [interpreter] script]"]
     catch {close $f} msg
-    removeFile stdout
-    removeFile script
     set msg
 } {777}
 	
@@ -2091,41 +1883,37 @@ test io-22.1 {Tcl_GetChannelMode} {
 } {}
 
 test io-23.1 {Tcl_GetChannelName} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     set n [testchannel name $f]
     close $f
-    removeFile test1
     string compare $n $f
 } 0
 
 test io-24.1 {Tcl_GetChannelType} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     set t [testchannel type $f]
     close $f
-    removeFile test1
     string compare $t file
 } 0
 
 test io-25.1 {Tcl_GetChannelHandle, input} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     puts $f "1234567890\n098765432"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     gets $f
     set l ""
     lappend l [testchannel inputbuffered $f]
     lappend l [tell $f]
     close $f
-    removeFile test1
     set l
 } {10 11}
 test io-25.2 {Tcl_GetChannelHandle, output} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello
     set l ""
@@ -2151,115 +1939,111 @@ test io-26.1 {Tcl_GetChannelInstanceData} {stdio} {
 # Test flushing. The functions tested here are FlushChannel.
 
 test io-27.1 {FlushChannel, no output buffered} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     flush $f
-    set s [file size $test1]
+    set s [file size test1]
     close $f
-    removeFile test1
     set s
 } 0
 test io-27.2 {FlushChannel, some output buffered} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set l ""
     puts $f hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    lappend l [file size $test1]
-    removeFile test1
+    lappend l [file size test1]
     set l
 } {0 6 6}
 test io-27.3 {FlushChannel, implicit flush on close} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set l ""
     puts $f hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    lappend l [file size $test1]
-    removeFile test1
+    lappend l [file size test1]
     set l
 } {0 6}
 test io-27.4 {FlushChannel, implicit flush when buffer fills} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     fconfigure $f -buffersize 60
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     for {set i 0} {$i < 12} {incr i} {
 	puts $f hello
     }
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {0 60 72}
 test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \
 	{unixOrPc} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffersize 60 -eofchar {}
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     for {set i 0} {$i < 12} {incr i} {
 	puts $f hello
     }
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    lappend l [file size $test1]
-    removeFile test1
+    lappend l [file size test1]
     set l
 } {0 60 72}
 test io-27.6 {FlushChannel, async flushing, async close} \
 	{stdio asyncPipeClose } {
-    set output [makeFile {} output]
-    set pipe [makeFile {
-	set f [open [file join [file dirname [info script]] output] w]
+    removeFile pipe
+    removeFile output
+    set f [open pipe w]
+    puts $f {
+	set f [open output w]
 	fconfigure $f -translation lf -buffering none -eofchar {}
 	while {![eof stdin]} {
 	    after 20
 	    puts -nonewline $f [read stdin 1024]
 	}
 	close $f
-    } pipe]
+    }
+    close $f
     set x 01234567890123456789012345678901
     for {set i 0} {$i < 11} {incr i} {
         set x "$x$x"
     }
-    close [open $output w]
-    set f [open "|[list [interpreter] $pipe]" w]
+    set f [open output w]
+    close $f
+    set f [open "|[list [interpreter] pipe]" w]
     fconfigure $f -blocking off
     puts -nonewline $f $x
     close $f
     set counter 0
-    while {([file size $output] < 65536) && ($counter < 1000)} {
+    while {([file size output] < 65536) && ($counter < 1000)} {
         incr counter
         after 20
         update
     }
-    removeFile pipe
     if {$counter == 1000} {
-        set result "file size only [file size $output]"
+        set result "file size only [file size output]"
     } else {
         set result ok
     }
-    removeFile output
-    set result
 } ok
 
 # Tests closing a channel. The functions tested are CloseChannel and Tcl_Close.
 
 test io-28.1 {CloseChannel called when all references are dropped} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     interp create x
     interp share "" $f x
     set l ""
@@ -2268,12 +2052,11 @@ test io-28.1 {CloseChannel called when all references are dropped} {testchannel}
     interp delete x
     lappend l [testchannel refcount $f]
     close $f
-    removeFile test1
     set l
 } {2 1}
 test io-28.2 {CloseChannel called when all references are dropped} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     interp create x
     interp share "" $f x
     puts -nonewline $f abc
@@ -2281,16 +2064,17 @@ test io-28.2 {CloseChannel called when all references are dropped} {
     x eval puts $f def
     x eval close $f
     interp delete x
-    set f [open $test1 r]
+    set f [open test1 r]
     set l [gets $f]
     close $f
-    removeFile test1
     set l
 } abcdef
 test io-28.3 {CloseChannel, not called before output queue is empty} \
 	{stdio asyncPipeClose nonPortable} {
-    set output [makeFile {} output]
-    set pipe [makeFile {
+    removeFile pipe
+    removeFile output
+    set f [open pipe w]
+    puts $f {
 
 	# Need to not have eof char appended on close, because the other
 	# side of the pipe already closed, so that writing would cause an
@@ -2299,34 +2083,32 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \
 	fconfigure stdout -eofchar {}
 	fconfigure stderr -eofchar {}
 
-	set f [open [file join [file dirname [info script]] output] w]
+	set f [open output w]
 	fconfigure $f -translation lf -buffering none
 	for {set x 0} {$x < 20} {incr x} {
 	    after 20
 	    puts -nonewline $f [read stdin 1024]
 	}
 	close $f
-    } pipe]
+    }
     close $f
     set x 01234567890123456789012345678901
     for {set i 0} {$i < 11} {incr i} {
         set x "$x$x"
     }
-    set f [open $output w]
+    set f [open output w]
     close $f
-    set f [open "|[list [interpreter] $pipe]" r+]
+    set f [open "|[list [interpreter] pipe]" r+]
     fconfigure $f -blocking off -eofchar {}
 
     puts -nonewline $f $x
     close $f
     set counter 0
-    while {([file size $output] < 20480) && ($counter < 1000)} {
+    while {([file size output] < 20480) && ($counter < 1000)} {
         incr counter
         after 20
         update
     }
-    removeFile pipe
-    removeFile output
     if {$counter == 1000} {
         set result probably_broken
     } else {
@@ -2334,28 +2116,29 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \
     }
 } ok
 test io-28.4 {Tcl_Close} {testchannel} {
+    removeFile test1
     set l ""
     lappend l [lsort [testchannel open]]
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     lappend l [lsort [testchannel open]]
     close $f
     lappend l [lsort [testchannel open]]
     set x [list $consoleFileNames \
 		[lsort [eval list $consoleFileNames $f]] \
 		$consoleFileNames]
-    removeFile test1
     string compare $l $x
 } 0
 test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly testchannel} {
-    set script [makeFile {
+    removeFile script
+    set f [open script w]
+    puts $f {
 	close stdin
 	puts [testchannel open]
-    } script]
-    set f [open "|[list [interpreter] $script]" r]
+    }
+    close $f
+    set f [open "|[list [interpreter] script]" r]
     set l [gets $f]
     close $f
-    removeFile script
     set l
 } {file1 file2}
 
@@ -2363,150 +2146,141 @@ test io-29.1 {Tcl_WriteChars, channel not writable} {
     list [catch {puts stdin hello} msg] $msg
 } {1 {channel "stdin" wasn't opened for writing}}
 test io-29.2 {Tcl_WriteChars, empty string} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -eofchar {}
     puts -nonewline $f ""
     close $f
-    set x [file size test1]
-    removeFile test1
-    set x
+    file size test1
 } 0
 test io-29.3 {Tcl_WriteChars, nonempty string} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -eofchar {}
     puts -nonewline $f hello
     close $f
-    set x [file size test1]
-    removeFile test1
-    set x
+    file size test1
 } 5
 test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffering full -eofchar {}
     puts $f hello
     set l ""
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {6 0 0 6}
 test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffering line -eofchar {}
     puts -nonewline $f hello
     set l ""
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts $f hello
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {5 0 0 11}
 test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffering none -eofchar {}
     puts -nonewline $f hello
     set l ""
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts $f hello
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {0 5 0 11}
 
 test io-29.7 {Tcl_Flush, full buffering} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffering full -eofchar {}
     puts -nonewline $f hello
     set l ""
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts $f hello
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {5 0 11 0 0 11}
 test io-29.8 {Tcl_Flush, full buffering} {testchannel} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -buffering line
     puts -nonewline $f hello
     set l ""
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts $f hello
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     flush $f
     lappend l [testchannel outputbuffered $f]
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f
-    removeFile test1
     set l
 } {5 0 0 5 0 11 0 11}
 test io-29.9 {Tcl_Flush, channel not writable} {
     list [catch {flush stdin} msg] $msg
 } {1 {channel "stdin" wasn't opened for writing}}
 test io-29.10 {Tcl_WriteChars, looping and buffering} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
-    set f2 [open $longfile r]
+    set f2 [open longfile r]
     for {set x 0} {$x < 10} {incr x} {
 	puts $f1 [gets $f2]
     }
     close $f2
     close $f1
-    set x [file size $test1]
-    removeFile test1
-    set x
+    file size test1
 } 387
 test io-29.11 {Tcl_WriteChars, no newline, implicit flush} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -eofchar {}
-    set f2 [open $longfile r]
+    set f2 [open longfile r]
     for {set x 0} {$x < 10} {incr x} {
 	puts -nonewline $f1 [gets $f2]
     }
     close $f1
     close $f2
-    set x [file size $test1]
-    removeFile test1
-    set x
+    file size test1
 } 377
 test io-29.12 {Tcl_WriteChars on a pipe} {stdio} {
-    set pipe [makeFile {
-	set f1 [open [lindex $argv 0] r]
+    removeFile test1
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
+	set f1 [open longfile r]
 	for {set x 0} {$x < 10} {incr x} {
 	    puts [gets $f1]
 	}
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe $longfile]" r]
-    set f2 [open $longfile r]
+    }
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r]
+    set f2 [open longfile r]
     set y ok
     for {set x 0} {$x < 10} {incr x} {
 	set l1 [gets $f1]
@@ -2517,18 +2291,21 @@ test io-29.12 {Tcl_WriteChars on a pipe} {stdio} {
     }
     close $f1
     close $f2
-    removeFile pipe
     set y
 } ok
 test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} {
-    set pipe [makeFile {
+    removeFile test1
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	puts [gets stdin]
 	puts [gets stdin]
-    } pipe]
+    }
+    close $f1
     set y ok
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    set f1 [open "|[list [interpreter] pipe]" r+]
     fconfigure $f1 -buffering line
-    set f2 [open $longfile r]
+    set f2 [open longfile r]
     set line [gets $f2]
     puts $f1 $line
     set backline [gets $f1]
@@ -2543,127 +2320,122 @@ test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} {
     }
     close $f1
     close $f2
-    removeFile pipe
     set y
 } ok
 test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    removeFile test3
+    set f [open test3 w]
     puts -nonewline $f "Text1"
     puts -nonewline $f " Text 2"
     puts $f " Text 3"
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     set x [gets $f]
     close $f
-    removeFile test3
     set x
 } {Text1 Text 2 Text 3}
 test io-29.15 {Tcl_Flush, channel not open for writing} {
-    set test1 [makeFile {} test1]
-    set fd [open $test1 w]
+    removeFile test1
+    set fd [open test1 w]
     close $fd
-    set fd [open $test1 r]
+    set fd [open test1 r]
     set x [list [catch {flush $fd} msg] $msg]
     close $fd
-    removeFile test1
     string compare $x \
 	[list 1 "channel \"$fd\" wasn't opened for writing"]
 } 0
 test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio} {
-    set fd [open "|[list [interpreter] cat $longfile]" r]
+    set fd [open "|[list [interpreter] cat longfile]" r]
     set x [list [catch {flush $fd} msg] $msg]
     catch {close $fd}
     string compare $x \
 	[list 1 "channel \"$fd\" wasn't opened for writing"]
 } 0
 test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf
     puts $f1 hello
     puts $f1 hello
     puts $f1 hello
     flush $f1
-    set x [file size $test1]
+    set x [file size test1]
     close $f1
-    removeFile test1
     set x
 } 18
 test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} {
+    removeFile test1
     set x ""
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf
     puts $f1 hello
     puts $f1 hello
     puts $f1 hello
     flush $f1
-    lappend x [file size $test1]
+    lappend x [file size test1]
     puts $f1 hello
     flush $f1
-    lappend x [file size $test1]
+    lappend x [file size test1]
     puts $f1 hello
     flush $f1
-    lappend x [file size $test1]
+    lappend x [file size test1]
     close $f1
-    removeFile test1
     set x
 } {18 24 30}
 test io-29.19 {Explicit and implicit flushes} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     set x ""
     puts $f1 hello
     puts $f1 hello
     puts $f1 hello
     flush $f1
-    lappend x [file size $test1]
+    lappend x [file size test1]
     puts $f1 hello
     flush $f1
-    lappend x [file size $test1]
+    lappend x [file size test1]
     puts $f1 hello
     close $f1
-    lappend x [file size $test1]
-    removeFile test1
+    lappend x [file size test1]
     set x
 } {18 24 30}
 test io-29.20 {Implicit flush when buffer is full} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     set line "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     for {set x 0} {$x < 100} {incr x} {
       puts $f1 $line
     }
     set z ""
-    lappend z [file size $test1]
+    lappend z [file size test1]
     for {set x 0} {$x < 100} {incr x} {
 	puts $f1 $line
     }
-    lappend z [file size $test1]
+    lappend z [file size test1]
     close $f1
-    lappend z [file size $test1]
-    removeFile test1
+    lappend z [file size test1]
     set z
 } {4096 12288 12600}
 test io-29.21 {Tcl_Flush to pipe} {stdio} {
-    set pipe [makeFile {
-	set x [read stdin 6]
-	set cnt [string length $x]
-	puts "read $cnt characters"
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {set x [read stdin 6]}
+    puts $f1 {set cnt [string length $x]}
+    puts $f1 {puts "read $cnt characters"}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     flush $f1
     set x [gets $f1]
     catch {close $f1}
-    removeFile pipe
     set x
 } "read 6 characters"
 test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} {
-    set pipe [makeFile {
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	fconfigure stdout -buffering full
 	puts hello
 	puts hello
@@ -2671,8 +2443,9 @@ test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} {
 	gets stdin
 	puts bye
 	flush stdout
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    }
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     set x ""
     lappend x [gets $f1]
     lappend x [gets $f1]
@@ -2680,17 +2453,19 @@ test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} {
     flush $f1
     lappend x [gets $f1]
     close $f1
-    removeFile pipe
     set x
 } {hello hello bye}
 test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} {
-    set pipe [makeFile {
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	puts hello
 	puts hello
 	gets stdin
 	puts bye
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    }
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     set x ""
     lappend x [gets $f1]
     lappend x [gets $f1]
@@ -2698,37 +2473,33 @@ test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} {
     flush $f1
     lappend x [gets $f1]
     close $f1
-    removeFile pipe
     set x
 } {hello hello bye}
 test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f "Line 1"
     puts $f "Line 2"
-    set f2 [open $test3]
+    set f2 [open test3]
     set x {}
     lappend x [read -nonewline $f2]
     close $f2
     flush $f
-    set f2 [open $test3]
+    set f2 [open test3]
     lappend x [read -nonewline $f2]
     close $f2
     close $f
-    removeFile test3
     set x
 } "{} {Line 1\nLine 2}"
 test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} {
-    set test3 [makeFile {} test3]
-    set f [open "|[list [interpreter] cat | [interpreter] cat > $test3]" w]
+    removeFile test3
+    set f [open "|[list [interpreter] cat | [interpreter] cat > test3]" w]
     puts $f "Line 1"
     puts $f "Line 2"
     close $f
     after 100
-    set f [open $test3 r]
+    set f [open test3 r]
     set x [read $f]
     close $f
-    removeFile test3
     set x
 } "Line 1\nLine 2\n"
 test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs} {
@@ -2740,8 +2511,11 @@ test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs
     set x
 } {Line1}
 test io-29.27 {Tcl_Flush on closed pipeline} {stdio} {
-    set pipe [makeFile {exit} pipe]
-    set f [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f [open pipe w]
+    puts $f {exit}
+    close $f
+    set f [open "|[list [interpreter] pipe]" r+]
     gets $f
     puts $f output
     after 50
@@ -2762,129 +2536,122 @@ test io-29.27 {Tcl_Flush on closed pipeline} {stdio} {
 	}
     }
     regsub {".*":} $x {"":} x
-    removeFile pipe
     string tolower $x
 } {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}}
 test io-29.28 {Tcl_WriteChars, lf mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     puts $f hello\nthere\nand\nhere
     flush $f
-    set s [file size $test1]
+    set s [file size test1]
     close $f
-    removeFile test1
     set s
 } 21
 test io-29.29 {Tcl_WriteChars, cr mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     puts $f hello\nthere\nand\nhere
     close $f
-    set x [file size $test1]
-    removeFile test1
-    set x
+    file size test1
 } 21
 test io-29.30 {Tcl_WriteChars, crlf mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     puts $f hello\nthere\nand\nhere
     close $f
-    set x [file size $test1]
-    removeFile test1
-    set x
+    file size test1
 } 25
 test io-29.31 {Tcl_WriteChars, background flush} {stdio} {
-    set output [makeFile {} output]
-    set pipe [makeFile {
-	set f [open [file join [file dirname [info script]] output] w]
-	fconfigure $f -translation lf
-	while {![eof stdin]} {
-	    puts -nonewline $f [read stdin 4096]
-	    flush $f
-	}
-	close $f
-    } pipe]
+    removeFile pipe
+    removeFile output
+    set f [open pipe w]
+    puts $f {set f [open output w]}
+    puts $f {fconfigure $f -translation lf}
+    set x [list while {![eof stdin]}]
+    set x "$x {"
+    puts $f $x
+    puts $f {  puts -nonewline $f [read stdin 4096]}
+    puts $f {  flush $f}
+    puts $f "}"
+    puts $f {close $f}
+    close $f
     set x 01234567890123456789012345678901
     for {set i 0} {$i < 11} {incr i} {
 	set x "$x$x"
     }
-    set f [open $output w]
+    set f [open output w]
     close $f
-    set f [open "|[list [interpreter] $pipe]" r+]
+    set f [open "|[list [interpreter] pipe]" r+]
     fconfigure $f -blocking off
     puts -nonewline $f $x
     close $f
     set counter 0
-    while {([file size $output] < 65536) && ($counter < 1000)} {
+    while {([file size output] < 65536) && ($counter < 1000)} {
 	incr counter
 	after 5
 	update
     }
-    removeFile pipe
     if {$counter == 1000} {
-	set result "file size only [file size $output]"
+	set result "file size only [file size output]"
     } else {
 	set result ok
     }
-    removeFile output
-    set result
 } ok
 test io-29.32 {Tcl_WriteChars, background flush to slow reader} \
 	{stdio asyncPipeClose} {
-    set output [makeFile {} output]
-    set pipe [makeFile {
-	set f [open [file join [file dirname [info script]] output] w]
-	fconfigure $f -translation lf
-	while {![eof stdin]} {
-	    after 20
-	    puts -nonewline $f [read stdin 1024]
-	    flush $f
-	}
-	close $f
-    } pipe]
+    removeFile pipe
+    removeFile output
+    set f [open pipe w]
+    puts $f {set f [open output w]}
+    puts $f {fconfigure $f -translation lf}
+    set x [list while {![eof stdin]}]
+    set x "$x {"
+    puts $f $x
+    puts $f {  after 20}
+    puts $f {  puts -nonewline $f [read stdin 1024]}
+    puts $f {  flush $f}
+    puts $f "}"
+    puts $f {close $f}
+    close $f
     set x 01234567890123456789012345678901
     for {set i 0} {$i < 11} {incr i} {
 	set x "$x$x"
     }
-    set f [open $output w]
+    set f [open output w]
     close $f
-    set f [open "|[list [interpreter] $pipe]" r+]
+    set f [open "|[list [interpreter] pipe]" r+]
     fconfigure $f -blocking off
     puts -nonewline $f $x
     close $f
     set counter 0
-    while {([file size $output] < 65536) && ($counter < 1000)} {
+    while {([file size output] < 65536) && ($counter < 1000)} {
 	incr counter
 	after 20
 	update
     }
-    removeFile pipe
     if {$counter == 1000} {
-	set result "file size only [file size $output]"
+	set result "file size only [file size output]"
     } else {
 	set result ok
     }
-    removeFile output
-    set result
 } ok
 test io-29.33 {Tcl_Flush, implicit flush on exit} {stdio} {
-    set test1 [makeFile {} test1]
-    set script [makeFile {
-	set f [open [file join [file dirname [info script]] test1] w]
+    set f [open script w]
+    puts $f {
+	set f [open test1 w]
 	fconfigure $f -translation lf
 	puts $f hello
 	puts $f bye
 	puts $f strange
-    } script]
-    exec [interpreter] $script
-    set f [open $test1 r]
+    }
+    close $f
+    exec [interpreter] script
+    set f [open test1 r]
     set r [read $f]
     close $f
-    removeFile test1
-    removeFile script
     set r
 } "hello\nbye\nstrange\n"
 test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac} {
@@ -2969,133 +2736,123 @@ test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotM
 # Test end of line translations. Procedures tested are Tcl_Write, Tcl_Read.
 
 test io-30.1 {Tcl_Write lf, Tcl_Read lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\nthere\nand\nhere\n"
 test io-30.2 {Tcl_Write lf, Tcl_Read cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\nthere\nand\nhere\n"
 test io-30.3 {Tcl_Write lf, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\nthere\nand\nhere\n"
 test io-30.4 {Tcl_Write cr, Tcl_Read cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\nthere\nand\nhere\n"
 test io-30.5 {Tcl_Write cr, Tcl_Read lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\rthere\rand\rhere\r"
 test io-30.6 {Tcl_Write cr, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x 
 } "hello\rthere\rand\rhere\r"
 test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\nthere\nand\nhere\n"
 test io-30.8 {Tcl_Write crlf, Tcl_Read lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\r\nthere\r\nand\r\nhere\r\n"
 test io-30.9 {Tcl_Write crlf, Tcl_Read cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } "hello\n\nthere\n\nand\n\nhere\n\n"
 test io-30.10 {Tcl_Write lf, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set c [read $f]
     set x [fconfigure $f -translation]
     close $f
-    removeFile test1
     list $c $x
 } {{hello
 there
@@ -3103,16 +2860,15 @@ and
 here
 } auto}
 test io-30.11 {Tcl_Write cr, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set c [read $f]
     set x [fconfigure $f -translation]
     close $f
-    removeFile test1
     list $c $x
 } {{hello
 there
@@ -3120,16 +2876,15 @@ and
 here
 } auto}
 test io-30.12 {Tcl_Write crlf, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set c [read $f]
     set x [fconfigure $f -translation]
     close $f
-    removeFile test1
     list $c $x
 } {{hello
 there
@@ -3138,8 +2893,8 @@ here
 } auto}
 
 test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set line "123456789ABCDE"	;# 14 char plus crlf
     puts -nonewline $f x	;# shift crlf across block boundary
@@ -3147,17 +2902,16 @@ test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} {
 	puts $f $line
     }
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set c [read $f]
     close $f
-    removeFile test1
     string length $c
 } [expr 700*15+1]
 
 test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set line "123456789ABCDE"	;# 14 char plus crlf
     puts -nonewline $f x	;# shift crlf across block boundary
@@ -3165,25 +2919,23 @@ test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} {
 	puts $f $line
     }
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set c [read $f]
     close $f
-    removeFile test1
     string length $c
 } [expr 700*15+1]
 
 test io-30.15 {Tcl_Write mixed, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\rhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set c [read $f]
     close $f
-    removeFile test1
     set c
 } {hello
 there
@@ -3191,16 +2943,15 @@ and
 here
 }
 test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f hello\nthere\nand\rhere\n\x1a
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set c [read $f]
     close $f
-    removeFile test1
     set c
 } {hello
 there
@@ -3208,16 +2959,15 @@ and
 here
 }
 test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -eofchar \x1a -translation lf
     puts $f hello\nthere\nand\rhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set c [read $f]
     close $f
-    removeFile test1
     set c
 } {hello
 there
@@ -3225,13 +2975,13 @@ and
 here
 }
 test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cghi\nqrs" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set l ""
     lappend l [gets $f]
@@ -3242,17 +2992,16 @@ test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1 {} 1}
 test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cghi\nqrs" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set l ""
     lappend l [gets $f]
@@ -3263,17 +3012,16 @@ test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1 {} 1}
 test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set s [format "abc\ndef\n%cghi\nqrs" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar {}
     set l ""
     lappend l [gets $f]
@@ -3286,17 +3034,16 @@ test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "abc def 0 \x1aghi 0 qrs 0 {} 1"
 test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set s [format "abc\ndef\n%cghi\nqrs" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar {}
     set l ""
     set x [gets $f]
@@ -3305,17 +3052,16 @@ test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {0 1 {} 1}
 test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set s [format "abc\ndef\n%cghi\nqrs" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar {}
     set l ""
     set x [gets $f]
@@ -3324,109 +3070,102 @@ test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {0 1 {} 1}
 test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format abc\ndef\n%cqrs\ntuv 26]
     puts $f $c
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar \x1a
     set c [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $e
 } {8 1}
 
 # Test end of line translations. Functions tested are Tcl_Write and Tcl_Gets.
 
 test io-31.1 {Tcl_Write lf, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     lappend l [gets $f]
     lappend l [tell $f]
@@ -3435,16 +3174,15 @@ test io-31.1 {Tcl_Write lf, Tcl_Gets auto} {
     lappend l [tell $f]
     lappend l [fconfigure $f -translation]
     close $f
-    removeFile test1
     set l
 } {hello 6 auto there 12 auto}
 test io-31.2 {Tcl_Write cr, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     lappend l [gets $f]
     lappend l [tell $f]
@@ -3453,16 +3191,15 @@ test io-31.2 {Tcl_Write cr, Tcl_Gets auto} {
     lappend l [tell $f]
     lappend l [fconfigure $f -translation]
     close $f
-    removeFile test1
     set l
 } {hello 6 auto there 12 auto}
 test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     lappend l [gets $f]
     lappend l [tell $f]
@@ -3471,16 +3208,15 @@ test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} {
     lappend l [tell $f]
     lappend l [fconfigure $f -translation]
     close $f
-    removeFile test1
     set l
 } {hello 7 auto there 14 auto}
 test io-31.4 {Tcl_Write lf, Tcl_Gets lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set l ""
     lappend l [gets $f]
@@ -3490,16 +3226,15 @@ test io-31.4 {Tcl_Write lf, Tcl_Gets lf} {
     lappend l [tell $f]
     lappend l [fconfigure $f -translation]
     close $f
-    removeFile test1
     set l
 } {hello 6 lf there 12 lf}
 test io-31.5 {Tcl_Write lf, Tcl_Gets cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set l ""
     lappend l [string length [gets $f]]
@@ -3511,16 +3246,15 @@ test io-31.5 {Tcl_Write lf, Tcl_Gets cr} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {21 21 cr 1 {} 21 cr 1}
 test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set l ""
     lappend l [string length [gets $f]]
@@ -3532,16 +3266,15 @@ test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {21 21 crlf 1 {} 21 crlf 1}
 test io-31.7 {Tcl_Write cr, Tcl_Gets cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set l ""
     lappend l [gets $f]
@@ -3553,16 +3286,15 @@ test io-31.7 {Tcl_Write cr, Tcl_Gets cr} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello 6 cr 0 there 12 cr 0}
 test io-31.8 {Tcl_Write cr, Tcl_Gets lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set l ""
     lappend l [string length [gets $f]]
@@ -3574,16 +3306,15 @@ test io-31.8 {Tcl_Write cr, Tcl_Gets lf} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {21 21 lf 1 {} 21 lf 1}
 test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set l ""
     lappend l [string length [gets $f]]
@@ -3595,16 +3326,15 @@ test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {21 21 crlf 1 {} 21 crlf 1}
 test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf
     set l ""
     lappend l [gets $f]
@@ -3616,16 +3346,15 @@ test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello 7 crlf 0 there 14 crlf 0}
 test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr
     set l ""
     lappend l [gets $f]
@@ -3637,16 +3366,15 @@ test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello 6 cr 0 6 13 cr 0}
 test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     puts $f hello\nthere\nand\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf
     set l ""
     lappend l [string length [gets $f]]
@@ -3658,16 +3386,14 @@ test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} {
     lappend l [fconfigure $f -translation]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {6 7 lf 0 6 14 lf 0}
 test io-31.13 {binary mode is synonym of lf mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation binary
     set x [fconfigure $f -translation]
     close $f
-    removeFile test1
     set x
 } lf
 #
@@ -3675,12 +3401,12 @@ test io-31.13 {binary mode is synonym of lf mode} {
 # not supoprted.
 #
 test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts $f hello\nthere\rand\r\nhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set l ""
     lappend l [gets $f]
@@ -3691,16 +3417,15 @@ test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f hello\nthere\rand\r\nhere\r
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set l ""
     lappend l [gets $f]
@@ -3711,16 +3436,15 @@ test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f hello\nthere\rand\r\nhere\n
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     lappend l [gets $f]
     lappend l [gets $f]
@@ -3730,16 +3454,15 @@ test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f hello\nthere\rand\r\nhere\r\n
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set l ""
     lappend l [gets $f]
@@ -3750,17 +3473,16 @@ test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "hello\nthere\nand\rhere\n\%c" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set l ""
     lappend l [gets $f]
@@ -3771,16 +3493,15 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -eofchar \x1a -translation lf
     puts $f hello\nthere\nand\rhere
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set l ""
     lappend l [gets $f]
@@ -3791,17 +3512,16 @@ test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {hello there and here 0 {} 1}
 test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a
     fconfigure $f -translation auto
     set l ""
@@ -3811,17 +3531,16 @@ test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     set l ""
     lappend l [gets $f]
@@ -3830,17 +3549,16 @@ test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar {}
     set l ""
     lappend l [gets $f]
@@ -3853,17 +3571,16 @@ test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "abc def 0 \x1aqrs 0 tuv 0 {} 1"
 test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar {}
     set l ""
     lappend l [gets $f]
@@ -3876,17 +3593,16 @@ test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "abc def 0 \x1aqrs 0 tuv 0 {} 1"
 test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar {}
     set l ""
     lappend l [gets $f]
@@ -3899,17 +3615,16 @@ test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "abc def 0 \x1aqrs 0 tuv 0 {} 1"
 test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -3918,17 +3633,16 @@ test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -3937,17 +3651,16 @@ test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -3956,17 +3669,16 @@ test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -3975,17 +3687,16 @@ test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -3994,17 +3705,16 @@ test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     set s [format "abc\ndef\n%cqrs\ntuv" 26]
     puts $f $s
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar \x1a
     set l ""
     lappend l [gets $f]
@@ -4013,12 +3723,11 @@ test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} {
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {abc def 0 {} 1}
 test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set line "123456789ABCDE"	;# 14 char plus crlf
     puts -nonewline $f x	;# shift crlf across block boundary
@@ -4026,19 +3735,18 @@ test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} {
 	puts $f $line
     }
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf 
     set c ""
     while {[gets $f line] >= 0} {
 	append c $line\n
     }
     close $f
-    removeFile test1
     string length $c
 } [expr 700*15+1]
 test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set line "123456789ABCDE"	;# 14 char plus crlf
     puts -nonewline $f x	;# shift crlf across block boundary
@@ -4046,14 +3754,13 @@ test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} {
 	puts $f $line
     }
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto
     set c ""
     while {[gets $f line] >= 0} {
 	append c $line\n
     }
     close $f
-    removeFile test1
     string length $c
 } [expr 700*15+1]
 
@@ -4067,13 +3774,13 @@ test io-32.2 {Tcl_Read, zero byte count} {
     read stdin 0
 } ""
 test io-32.3 {Tcl_Read, negative byte count} {
-    set f [open $longfile r]
+    set f [open longfile r]
     set l [list [catch {read $f -1} msg] $msg]
     close $f
     set l
 } {1 {bad argument "-1": should be "nonewline"}}
 test io-32.4 {Tcl_Read, positive byte count} {
-    set f [open $longfile r]
+    set f [open longfile r]
     set x [read $f 1024]
     set s [string length $x]
     unset x
@@ -4081,7 +3788,7 @@ test io-32.4 {Tcl_Read, positive byte count} {
     set s
 } 1024
 test io-32.5 {Tcl_Read, multiple buffers} {
-    set f [open $longfile r]
+    set f [open longfile r]
     fconfigure $f -buffersize 100
     set x [read $f 1024]
     set s [string length $x]
@@ -4090,19 +3797,19 @@ test io-32.5 {Tcl_Read, multiple buffers} {
     set s
 } 1024
 test io-32.6 {Tcl_Read, very large read} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     set z [read $f1 1000000]
     close $f1
     set l [string length $z]
     set x ok
-    set z [file size $longfile]
+    set z [file size longfile]
     if {$z != $l} {
 	set x broken
     }
     set x
 } ok
 test io-32.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     fconfigure $f1 -blocking off
     set z [read $f1 20]
     close $f1
@@ -4114,46 +3821,49 @@ test io-32.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} {
     set x
 } ok
 test io-32.8 {Tcl_Read, nonblocking, file} {nonBlockFiles} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     fconfigure $f1 -blocking off
     set z [read $f1 1000000]
     close $f1
     set x ok
     set l [string length $z]
-    set z [file size $longfile]
+    set z [file size longfile]
     if {$z != $l} {
 	set x broken
     }
     set x
 } ok
 test io-32.9 {Tcl_Read, read to end of file} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     set z [read $f1]
     close $f1
     set l [string length $z]
     set x ok
-    set z [file size $longfile]
+    set z [file size longfile]
     if {$z != $l} {
 	set x broken
     }
     set x
 } ok
 test io-32.10 {Tcl_Read from a pipe} {stdio} {
-    set pipe [makeFile {puts [gets stdin]} pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {puts [gets stdin]}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     flush $f1
     set x [read $f1]
     close $f1
-    removeFile pipe
     set x
 } "hello\n"
 test io-32.11 {Tcl_Read from a pipe} {stdio} {
-    set pipe [makeFile {
-	puts [gets stdin]
-	puts [gets stdin]
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {puts [gets stdin]}
+    puts $f1 {puts [gets stdin]}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     flush $f1
     set x ""
@@ -4162,75 +3872,69 @@ test io-32.11 {Tcl_Read from a pipe} {stdio} {
     flush $f1
     lappend x [read $f1]
     close $f1
-    removeFile pipe
     set x
 } {{hello
 } {hello
 }}
 test io-32.12 {Tcl_Read, -nonewline} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     puts $f1 hello
     puts $f1 bye
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     set c [read -nonewline $f1]
     close $f1
-    removeFile test1
     set c
 } {hello
 bye}
 test io-32.13 {Tcl_Read, -nonewline} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     puts $f1 hello
     puts $f1 bye
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     set c [read -nonewline $f1]
     close $f1
-    removeFile test1
     list [string length $c] $c
 } {9 {hello
 bye}}
 test io-32.14 {Tcl_Read, reading in small chunks} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f "Two lines: this one"
     puts $f "and this one"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [list [read $f 1] [read $f 2] [read $f]]
     close $f
-    removeFile test1
     set x
 } {T wo { lines: this one
 and this one
 }}
 test io-32.15 {Tcl_Read, asking for more input than available} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f "Two lines: this one"
     puts $f "and this one"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [read $f 100]
     close $f
-    removeFile test1
     set x
 } {Two lines: this one
 and this one
 }
 test io-32.16 {Tcl_Read, read to end of file with -nonewline} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f "Two lines: this one"
     puts $f "and this one"
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [read -nonewline $f]
     close $f
-    removeFile test1
     set x
 } {Two lines: this one
 and this one}
@@ -4238,23 +3942,22 @@ and this one}
 # Test Tcl_Gets.
 
 test io-33.1 {Tcl_Gets, reading what was written} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set y "first line"
     puts $f1 $y
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     set x [gets $f1]
     set z ok
     if {"$x" != "$y"} {
 	set z broken
     }
     close $f1
-    removeFile test1
     set z
 } ok
 test io-33.2 {Tcl_Gets into variable} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     set c [gets $f1 x]
     set l [string length x]
     set z ok
@@ -4265,8 +3968,11 @@ test io-33.2 {Tcl_Gets into variable} {
     set z
 } ok
 test io-33.3 {Tcl_Gets from pipe} {stdio} {
-    set pipe [makeFile {puts [gets stdin]} pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {puts [gets stdin]}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     flush $f1
     set x [gets $f1]
@@ -4275,45 +3981,34 @@ test io-33.3 {Tcl_Gets from pipe} {stdio} {
     if {"$x" != "hello"} {
 	set z broken
     }
-    removeFile pipe
     set z
 } ok
 test io-33.4 {Tcl_Gets with long line} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    removeFile test3
+    set f [open test3 w]
     puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     puts $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     close $f
-    set f [open $test3]
+    set f [open test3]
     set x [gets $f]
     close $f
-    removeFile test3
     set x
 } {abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}
 test io-33.5 {Tcl_Gets with long line} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    close $f
-    set f [open $test3]
+    set f [open test3]
     set x [gets $f y]
     close $f
-    removeFile test3
     list $x $y
 } {260 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}
 test io-33.6 {Tcl_Gets and end of file} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    removeFile test3
+    set f [open test3 w]
     puts -nonewline $f "Test1\nTest2"
     close $f
-    set f [open $test3]
+    set f [open test3]
     set x {}
     set y {}
     lappend x [gets $f y] $y
@@ -4322,166 +4017,151 @@ test io-33.6 {Tcl_Gets and end of file} {
     set y {}
     lappend x [gets $f y] $y
     close $f
-    removeFile test3
     set x
 } {5 Test1 5 Test2 -1 {}}
 test io-33.7 {Tcl_Gets and bad variable} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f "Line 1"
     puts $f "Line 2"
     close $f
     catch {unset x}
     set x 24
-    set f [open $test3 r]
+    set f [open test3 r]
     set result [list [catch {gets $f x(0)} msg] $msg]
     close $f
-    removeFile test3
     set result
 } {1 {can't set "x(0)": variable isn't array}}
 test io-33.8 {Tcl_Gets, exercising double buffering} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     set x ""
     for {set y 0} {$y < 99} {incr y} {set x "a$x"}
     for {set y 0} {$y < 100} {incr y} {puts $f $x}
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     fconfigure $f -translation lf
     for {set y 0} {$y < 100} {incr y} {gets $f}
     close $f
-    removeFile test3
     set y
 } 100
 test io-33.9 {Tcl_Gets, exercising double buffering} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     set x ""
     for {set y 0} {$y < 99} {incr y} {set x "a$x"}
     for {set y 0} {$y < 200} {incr y} {puts $f $x}
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     fconfigure $f -translation lf
     for {set y 0} {$y < 200} {incr y} {gets $f}
     close $f
-    removeFile test3
     set y
 } 200
 test io-33.10 {Tcl_Gets, exercising double buffering} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     set x ""
     for {set y 0} {$y < 99} {incr y} {set x "a$x"}
     for {set y 0} {$y < 300} {incr y} {puts $f $x}
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     fconfigure $f -translation lf
     for {set y 0} {$y < 300} {incr y} {gets $f}
     close $f
-    removeFile test3
     set y
 } 300
 
 # Test Tcl_Seek and Tcl_Tell.
 
 test io-34.1 {Tcl_Seek to current position at start of file} {
-    set f1 [open $longfile r]
+    set f1 [open longfile r]
     seek $f1 0 current
     set c [tell $f1]
     close $f1
     set c
 } 0
 test io-34.2 {Tcl_Seek to offset from start} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 10 start
     set c [tell $f1]
     close $f1
-    removeFile test1
     set c
 } 10
 test io-34.3 {Tcl_Seek to end of file} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 0 end
     set c [tell $f1]
     close $f1
-    removeFile test1
     set c
 } 54
 test io-34.4 {Tcl_Seek to offset from end of file} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 -10 end
     set c [tell $f1]
     close $f1
-    removeFile test1
     set c
 } 44
 test io-34.5 {Tcl_Seek to offset from current position} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 10 current
     seek $f1 10 current
     set c [tell $f1]
     close $f1
-    removeFile test1
     set c
 } 20
 test io-34.6 {Tcl_Seek to offset from end of file} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 -10 end
     set c [tell $f1]
     set r [read $f1]
     close $f1
-    removeFile test1
     list $c $r
 } {44 {rstuvwxyz
 }}
 test io-34.7 {Tcl_Seek to offset from end of file, then to current position} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 -10 end
     set c1 [tell $f1]
     set r1 [read $f1 5]
     seek $f1 0 current
     set c2 [tell $f1]
     close $f1
-    removeFile test1
     list $c1 $r1 $c2
 } {44 rstuv 49}
 test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} {
@@ -4492,12 +4172,12 @@ test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} {
     string tolower $x
 } {1 {error during seek on "": invalid argument}}
 test io-34.9 {Tcl_Seek, testing buffered input flushing} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    removeFile test3
+    set f [open test3 w]
     fconfigure $f -eofchar {}
     puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     close $f
-    set f [open $test3 RDWR]
+    set f [open test3 RDWR]
     set x [read $f 1]
     seek $f 3
     lappend x [read $f 1]
@@ -4512,46 +4192,39 @@ test io-34.9 {Tcl_Seek, testing buffered input flushing} {
     seek $f 1
     lappend x [read $f 1]
     close $f
-    removeFile test3
     set x
 } {a d a l Y {} b}
 test io-34.10 {Tcl_Seek testing flushing of buffered input} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf
     puts $f xyz\n123
     close $f
-    set f [open $test3 r+]
+    set f [open test3 r+]
     fconfigure $f -translation lf
     set x [gets $f]
     seek $f 0 current
     puts $f 456
     close $f
-    set result [list $x [viewFile test3]]
-    removeFile test3
-    set result
-} "xyz {xyz\n456\n}"
+    list $x [viewFile test3]
+} "xyz {xyz
+456}"
 test io-34.11 {Tcl_Seek testing flushing of buffered output} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f xyz\n123
     close $f
-    set f [open $test3 w+]
+    set f [open test3 w+]
     puts $f xyzzy
     seek $f 2
     set x [gets $f]
     close $f
-    set result [list $x [viewFile $test3]]
-    removeFile test3
-    set result
-} "zzy {xyzzy\n}"
+    list $x [viewFile test3]
+} "zzy xyzzy"
 test io-34.12 {Tcl_Seek testing combination of write, seek back and read} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     puts $f xyz\n123
     close $f
-    set f [open $test3 a+]
+    set f [open test3 a+]
     fconfigure $f -translation lf -eofchar {}
     puts $f xyzzy
     flush $f
@@ -4559,49 +4232,43 @@ test io-34.12 {Tcl_Seek testing combination of write, seek back and read} {
     seek $f -4 cur
     set y [gets $f]
     close $f
-    set result [list $x [viewFile test3] $y]
-    removeFile test3
-    set result
+    list $x [viewFile test3] $y
 } {14 {xyz
 123
-xyzzy
-} zzy}
+xyzzy} zzy}
 test io-34.13 {Tcl_Tell at start of file} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set p [tell $f1]
     close $f1
-    removeFile test1
     set p
 } 0
 test io-34.14 {Tcl_Tell after seek to end of file} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 0 end
     set c1 [tell $f1]
     close $f1
-    removeFile test1
     set c1
 } 54
 test io-34.15 {Tcl_Tell combined with seeking} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -eofchar {}
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     puts $f1 "abcdefghijklmnopqrstuvwxyz"
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     seek $f1 10 start
     set c1 [tell $f1]
     seek $f1 10 current
     set c2 [tell $f1]
     close $f1
-    removeFile test1
     list $c1 $c2
 } {10 20}
 test io-34.16 {Tcl_tell on pipe: always -1} {stdio} {
@@ -4620,12 +4287,12 @@ test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} {
     set c
 } -1
 test io-34.18 {Tcl_Tell combined with seeking and reading} {
-    set test2 [makeFile {} test2]
-    set f [open $test2 w]
+    removeFile test2
+    set f [open test2 w]
     fconfigure $f -translation lf -eofchar {}
     puts -nonewline $f "line1\nline2\nline3\nline4\nline5\n"
     close $f
-    set f [open $test2]
+    set f [open test2]
     fconfigure $f -translation lf
     set x [tell $f]
     read $f 3
@@ -4637,25 +4304,21 @@ test io-34.18 {Tcl_Tell combined with seeking and reading} {
     seek $f 0 end
     lappend x [tell $f]
     close $f
-    removeFile test2
     set x
 } {0 3 2 12 30}
 test io-34.19 {Tcl_Tell combined with opening in append mode} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     puts $f "abcdefghijklmnopqrstuvwxyz"
     puts $f "abcdefghijklmnopqrstuvwxyz"
     close $f
-    set f [open $test3 a]
+    set f [open test3 a]
     set c [tell $f]
     close $f
-    removeFile test3
     set c
 } 54
 test io-34.20 {Tcl_Tell combined with writing} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    set f [open test3 w]
     set l ""
     seek $f 29 start
     lappend l [tell $f]
@@ -4667,12 +4330,11 @@ test io-34.20 {Tcl_Tell combined with writing} {
     seek $f 407 end
     lappend l [tell $f]
     close $f
-    removeFile test3
     set l
 } {29 39 40 447}
 test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} {
-    set test3 [makeFile {} test3]
-    set f [open $test3 w]
+    removeFile test3
+    set f [open test3 w]
     fconfigure $f -encoding binary
     set l ""
     lappend l [tell $f]
@@ -4688,21 +4350,20 @@ test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} {
     close $f
     lappend l [file size $f]
     # truncate...
-    close [open $test3 w]
+    close [open test3 w]
     lappend l [file size $f]
-    removeFile test3
     set l
 } {0 6 6 4294967296 4294967302 4294967302 0}
 
 # Test Tcl_Eof
 
 test io-35.1 {Tcl_Eof} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f hello
     puts $f hello
     close $f
-    set f [open $test1]
+    set f [open test1]
     set x [eof $f]
     lappend x [eof $f]
     gets $f
@@ -4713,15 +4374,15 @@ test io-35.1 {Tcl_Eof} {
     lappend x [eof $f]
     lappend x [eof $f]
     close $f
-    removeFile test1
     set x
 } {0 0 0 0 1 1}
 test io-35.2 {Tcl_Eof with pipe} {stdio} {
-    set pipe [makeFile {
-	gets stdin
-	puts hello
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {gets stdin}
+    puts $f1 {puts hello}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     set x [eof $f1]
     flush $f1
@@ -4731,15 +4392,15 @@ test io-35.2 {Tcl_Eof with pipe} {stdio} {
     gets $f1
     lappend x [eof $f1]
     close $f1
-    removeFile pipe
     set x
 } {0 0 0 1}
 test io-35.3 {Tcl_Eof with pipe} {stdio} {
-    set pipe [makeFile {
-	gets stdin
-	puts hello
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {gets stdin}
+    puts $f1 {puts hello}
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     puts $f1 hello
     set x [eof $f1]
     flush $f1
@@ -4753,218 +4414,206 @@ test io-35.3 {Tcl_Eof with pipe} {stdio} {
     gets $f1
     lappend x [eof $f1]
     close $f1
-    removeFile pipe
     set x
 } {0 0 0 1 1 1}
 test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -blocking off
     set l ""
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {{} 1}
 test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} {
-    set pipe [makeFile {
+    removeFile pipe
+    set f [open pipe w]
+    puts $f {
 	exit
-    } pipe]
-    set f [open "|[list [interpreter] $pipe]" r]
+    }
+    close $f
+    set f [open "|[list [interpreter] pipe]" r]
     set l ""
     lappend l [gets $f]
     lappend l [eof $f]
     close $f
-    removeFile pipe
     set l
 } {{} 1}
 test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {9 8 1}
 test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {9 8 1}
 test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {9 8 1}
 test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {9 8 1}
 test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {11 8 1}
 test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar \x1a
     puts $f abc\ndef
     close $f
-    set s [file size $test1]
-    set f [open $test1 r]
+    set s [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $s $l $e
 } {11 8 1}
 test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {17 8 1}
 test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {17 8 1}
 test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {17 8 1}
 test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {17 8 1}
 test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {21 8 1}
 test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf -eofchar {}
     set i [format abc\ndef\n%cqrs\nuvw 26]
     puts $f $i
     close $f
-    set c [file size $test1]
-    set f [open $test1 r]
+    set c [file size test1]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar \x1a
     set l [string length [read $f]]
     set e [eof $f]
     close $f
-    removeFile test1
     list $c $l $e
 } {21 8 1}
 
@@ -5004,11 +4653,11 @@ test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} {
     set x
 } {hello_from_pipe 0 {} 0 1}
 test io-36.3 {Tcl_InputBlocked vs files, short read} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f abcdefghijklmnop
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     lappend l [fblocked $f]
     lappend l [read $f 3]
@@ -5017,35 +4666,33 @@ test io-36.3 {Tcl_InputBlocked vs files, short read} {
     lappend l [fblocked $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {0 abc 0 defghijklmnop 0 1}
 test io-36.4 {Tcl_InputBlocked vs files, event driven read} {
-    set test1 [makeFile {} test1]
     proc in {f} {
         variable l
         variable x
 	lappend l [read $f 3]
 	if {[eof $f]} {lappend l eof; close $f; set x done}
     }
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f abcdefghijklmnop
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
     fileevent $f readable [namespace code [list in $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     set l
 } {abc def ghi jkl mno {p
 } eof}
 test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f abcdefghijklmnop
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -blocking off
     set l ""
     lappend l [fblocked $f]
@@ -5055,27 +4702,25 @@ test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles
     lappend l [fblocked $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } {0 abc 0 defghijklmnop 0 1}
 test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} {
-    set test1 [makeFile {} test1]
     proc in {f} {
         variable l
         variable x
 	lappend l [read $f 3]
 	if {[eof $f]} {lappend l eof; close $f; set x done}
     }
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     puts $f abcdefghijklmnop
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -blocking off
     set l ""
     fileevent $f readable [namespace code [list in $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     set l
 } {abc def ghi jkl mno {p
 } eof}
@@ -5083,7 +4728,7 @@ test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} {
 # Test Tcl_InputBuffered
 
 test io-37.1 {Tcl_InputBuffered} {testchannel} {
-    set f [open $longfile r]
+    set f [open longfile r]
     fconfigure $f -buffersize 4096
     read $f 3
     set l ""
@@ -5093,7 +4738,7 @@ test io-37.1 {Tcl_InputBuffered} {testchannel} {
     set l
 } {4093 3}
 test io-37.2 {Tcl_InputBuffered, test input flushing on seek} {testchannel} {
-    set f [open $longfile r]
+    set f [open longfile r]
     fconfigure $f -buffersize 4096
     read $f 3
     set l ""
@@ -5109,13 +4754,13 @@ test io-37.2 {Tcl_InputBuffered, test input flushing on seek} {testchannel} {
 # Test Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize
 
 test io-38.1 {Tcl_GetChannelBufferSize, default buffer size} {
-    set f [open $longfile r]
+    set f [open longfile r]
     set s [fconfigure $f -buffersize]
     close $f
     set s
 } 4096
 test io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} {
-    set f [open $longfile r]
+    set f [open longfile r]
     set l ""
     lappend l [fconfigure $f -buffersize]
     fconfigure $f -buffersize 10000
@@ -5148,36 +4793,33 @@ test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} {
 # Test Tcl_SetChannelOption, Tcl_GetChannelOption
 
 test io-39.1 {Tcl_GetChannelOption} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set x [fconfigure $f1 -blocking]
     close $f1
-    removeFile test1
     set x
 } 1
 #
 # Test 17.2 was removed.
 #
 test io-39.2 {Tcl_GetChannelOption} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set x [fconfigure $f1 -buffering]
     close $f1
-    removeFile test1
     set x
 } full
 test io-39.3 {Tcl_GetChannelOption} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -buffering line
     set x [fconfigure $f1 -buffering]
     close $f1
-    removeFile test1
     set x
 } line
 test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set l ""
     lappend l [fconfigure $f1 -buffering]
     fconfigure $f1 -buffering line
@@ -5189,72 +4831,67 @@ test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} {
     fconfigure $f1 -buffering full
     lappend l [fconfigure $f1 -buffering]
     close $f1
-    removeFile test1
     set l
 } {full line none line full}
 test io-39.5 {Tcl_GetChannelOption, invariance} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set l ""
     lappend l [fconfigure $f1 -buffering]
     lappend l [list [catch {fconfigure $f1 -buffering green} msg] $msg]
     lappend l [fconfigure $f1 -buffering]
     close $f1
-    removeFile test1
     set l
 } {full {1 {bad value for -buffering: must be one of full, line, or none}} full}
 test io-39.6 {Tcl_SetChannelOption, multiple options} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf -buffering line
     puts $f1 hello
     puts $f1 bye
-    set x [file size $test1]
+    set x [file size test1]
     close $f1
-    removeFile test1
     set x
 } 10
 test io-39.7 {Tcl_SetChannelOption, buffering, translation} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     fconfigure $f1 -translation lf
     puts $f1 hello
     puts $f1 bye
     set x ""
     fconfigure $f1 -buffering line
-    lappend x [file size $test1]
+    lappend x [file size test1]
     puts $f1 really_bye
-    lappend x [file size $test1]
+    lappend x [file size test1]
     close $f1
-    removeFile test1
     set x
 } {0 21}
 test io-39.8 {Tcl_SetChannelOption, different buffering options} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     set l ""
     fconfigure $f1 -translation lf -buffering none -eofchar {}
     puts -nonewline $f1 hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts -nonewline $f1 hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f1 -buffering full
     puts -nonewline $f1 hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f1 -buffering none
-    lappend l [file size $test1]
+    lappend l [file size test1]
     puts -nonewline $f1 hello
-    lappend l [file size $test1]
+    lappend l [file size test1]
     close $f1
-    lappend l [file size $test1]
-    removeFile test1
+    lappend l [file size test1]
     set l
 } {5 10 10 10 20 20}
 test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w]
+    removeFile test1
+    set f1 [open test1 w]
     close $f1
-    set f1 [open $test1 r]
+    set f1 [open test1 r]
     set x ""
     lappend x [fconfigure $f1 -blocking]
     fconfigure $f1 -blocking off
@@ -5264,18 +4901,20 @@ test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} {
     lappend x [fblocked $f1]
     lappend x [eof $f1]
     close $f1
-    removeFile test1
     set x
 } {1 0 {} {} 0 1}
 test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} {
-    set pipe [makeFile {
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	gets stdin
 	after 100
 	puts hi
 	gets stdin
-    } pipe]
+    }
+    close $f1
     set x ""
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    set f1 [open "|[list [interpreter] pipe]" r+]
     fconfigure $f1 -blocking off -buffering line
     lappend x [fconfigure $f1 -blocking]
     lappend x [gets $f1]
@@ -5301,64 +4940,58 @@ test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} {
     set x
 } {0 {} 1 {} 1 {} 1 1 hi 0 0 {} 1}
 test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -buffersize -10
     set x [fconfigure $f -buffersize]
     close $f
-    removeFile test1
     set x
 } 4096
 test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -buffersize 10000000
     set x [fconfigure $f -buffersize]
     close $f
-    removeFile test1
     set x
 } 4096
 test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -buffersize 40000
     set x [fconfigure $f -buffersize]
     close $f
-    removeFile test1
     set x
 } 40000
 test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -encoding {} 
     puts -nonewline $f \xe7\x89\xa6
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -encoding utf-8
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } \u7266
 test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -encoding binary
     puts -nonewline $f \xe7\x89\xa6
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -encoding utf-8
     set x [read $f]
     close $f
-    removeFile test1
     set x
 } \u7266
 test io-39.16 {Tcl_SetChannelOption: -encoding, errors} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     set result [list [catch {fconfigure $f -encoding foobar} msg] $msg]
     close $f
-    removeFile test1
     set result
 } {1 {unknown encoding "foobar"}}
 test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio} {
@@ -5438,8 +5071,8 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
 } {auto crlf}
 
 test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w+]
+    removeFile test1
+    set f1 [open test1 w+]
     set l ""
     lappend l [fconfigure $f1 -eofchar]
     fconfigure $f1 -eofchar {ON GO}
@@ -5447,13 +5080,12 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} {
     fconfigure $f1 -eofchar D
     lappend l [fconfigure $f1 -eofchar]
     close $f1
-    removeFile test1
     set l
 } {{{} {}} {O G} {D D}}
 
 test io-39.22a {Tcl_SetChannelOption, invariance} {
-    set test1 [makeFile {} test1]
-    set f1 [open $test1 w+]
+    removeFile test1
+    set f1 [open test1 w+]
     set l [list]
     fconfigure $f1 -eofchar {ON GO}
     lappend l [fconfigure $f1 -eofchar]
@@ -5461,7 +5093,6 @@ test io-39.22a {Tcl_SetChannelOption, invariance} {
     lappend l [fconfigure $f1 -eofchar]
     lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg]
     close $f1
-    removeFile test1
     set l
 } {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}}
 
@@ -5485,36 +5116,30 @@ test io-39.24 {Tcl_SetChannelOption, server socket is not readable or
 } {{{}} auto}
 
 test io-40.1 {POSIX open access modes: RDWR} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f xyzzy
     close $f
-    set f [open $test3 RDWR]
+    set f [open test3 RDWR]
     puts -nonewline $f "ab"
     seek $f 0 current
     set x [gets $f]
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     lappend x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } {zzy abzzy}
 test io-40.2 {POSIX open access modes: CREAT} {unixOnly} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 {WRONLY CREAT} 0600]
-    file stat $test3 stats
+    set f [open test3 {WRONLY CREAT} 0600]
+    file stat test3 stats
     set x [format "0%o" [expr $stats(mode)&0777]]
     puts $f "line 1"
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     lappend x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } {0600 {line 1}}
 
@@ -5524,178 +5149,147 @@ catch {testConstraint umask2 [expr {[exec umask] == 2}]}
 
 test io-40.3 {POSIX open access modes: CREAT} {unixOnly umask2} {
     # This test only works if your umask is 2, like ouster's.
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 {WRONLY CREAT}]
+    set f [open test3 {WRONLY CREAT}]
     close $f
-    file stat $test3 stats
-    makeFile {} test3
-    removeFile test3
+    file stat test3 stats
     format "0%o" [expr $stats(mode)&0777]
 } 0664
 test io-40.4 {POSIX open access modes: CREAT} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -eofchar {}
     puts $f xyzzy
     close $f
-    set f [open $test3 {WRONLY CREAT}]
+    set f [open test3 {WRONLY CREAT}]
     fconfigure $f -eofchar {}
     puts -nonewline $f "ab"
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     set x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } abzzy
 test io-40.5 {POSIX open access modes: APPEND} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 w]
+    set f [open test3 w]
     fconfigure $f -translation lf -eofchar {}
     puts $f xyzzy
     close $f
-    set f [open $test3 {WRONLY APPEND}]
+    set f [open test3 {WRONLY APPEND}]
     fconfigure $f -translation lf
     puts $f "new line"
     seek $f 0
     puts $f "abc"
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     fconfigure $f -translation lf
     set x ""
     seek $f 6 current
     lappend x [gets $f]
     lappend x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } {{new line} abc}
 test io-40.6 {POSIX open access modes: EXCL} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f xyzzy
     close $f
-    set msg [list [catch {open $test3 {WRONLY CREAT EXCL}} msg] $msg]
+    set msg [list [catch {open test3 {WRONLY CREAT EXCL}} msg] $msg]
     regsub " already " $msg " " msg
-    regsub [file join {} $test3] $msg "test3" msg
-    makeFile {} test3
-    removeFile test3
+    regsub [file join {} test3] $msg "test3" msg
     string tolower $msg
 } {1 {couldn't open "test3": file exists}}
 test io-40.7 {POSIX open access modes: EXCL} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 {WRONLY CREAT EXCL}]
+    set f [open test3 {WRONLY CREAT EXCL}]
     fconfigure $f -eofchar {}
     puts $f "A test line"
     close $f
-    set x [viewFile test3]
-    makeFile {} test3
-    removeFile test3
-    set x
-} "A test line\n"
+    viewFile test3
+} {A test line}
 test io-40.8 {POSIX open access modes: TRUNC} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 w]
+    set f [open test3 w]
     puts $f xyzzy
     close $f
-    set f [open $test3 {WRONLY TRUNC}]
+    set f [open test3 {WRONLY TRUNC}]
     puts $f abc
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     set x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } abc
 test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set f [open $test3 {WRONLY NONBLOCK CREAT}]
+    set f [open test3 {WRONLY NONBLOCK CREAT}]
     puts $f "NONBLOCK test"
     close $f
-    set f [open $test3 r]
+    set f [open test3 r]
     set x [gets $f]
     close $f
-    makeFile {} test3
-    removeFile test3
     set x
 } {NONBLOCK test}
 test io-40.10 {POSIX open access modes: RDONLY} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    set f [open test1 w]
     puts $f "two lines: this one"
     puts $f "and this"
     close $f
-    set f [open $test1 RDONLY]
+    set f [open test1 RDONLY]
     set x [list [gets $f] [catch {puts $f Test} msg] $msg]
     close $f
-    removeFile test1
     string compare [string tolower $x] \
 	[list {two lines: this one} 1 \
 		[format "channel \"%s\" wasn't opened for writing" $f]]
 } 0
 test io-40.11 {POSIX open access modes: RDONLY} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set msg [list [catch {open $test3 RDONLY} msg] $msg]
-    regsub [file join {} $test3] $msg "test3" msg
+    set msg [list [catch {open test3 RDONLY} msg] $msg]
+    regsub [file join {} test3] $msg "test3" msg
 	string tolower $msg
 } {1 {couldn't open "test3": no such file or directory}}
 test io-40.12 {POSIX open access modes: WRONLY} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set msg [list [catch {open $test3 WRONLY} msg] $msg]
-    regsub [file join {} $test3] $msg "test3" msg
+    set msg [list [catch {open test3 WRONLY} msg] $msg]
+    regsub [file join {} test3] $msg "test3" msg
 	string tolower $msg
 } {1 {couldn't open "test3": no such file or directory}}
 test io-40.13 {POSIX open access modes: WRONLY} {
-    set test3 [makeFile xyzzy test3]
-    set f [open $test3 WRONLY]
+    makeFile xyzzy test3
+    set f [open test3 WRONLY]
     fconfigure $f -eofchar {}
     puts -nonewline $f "ab"
     seek $f 0 current
     set x [list [catch {gets $f} msg] $msg]
     close $f
     lappend x [viewFile test3]
-    removeFile test3
     string compare [string tolower $x] \
 	[list 1 "channel \"$f\" wasn't opened for reading" abzzy]
 } 0
 test io-40.14 {POSIX open access modes: RDWR} {
-    set test3 [makeFile {} test3]
     removeFile test3
-    set msg [list [catch {open $test3 RDWR} msg] $msg]
-    regsub [file join {} $test3] $msg "test3" msg
-    string tolower $msg
+    set msg [list [catch {open test3 RDWR} msg] $msg]
+    regsub [file join {} test3] $msg "test3" msg
+	string tolower $msg
 } {1 {couldn't open "test3": no such file or directory}}
 test io-40.15 {POSIX open access modes: RDWR} {
-    set test3 [makeFile xyzzy test3]
-    set f [open $test3 RDWR]
+    makeFile xyzzy test3
+    set f [open test3 RDWR]
     puts -nonewline $f "ab"
     seek $f 0 current
     set x [gets $f]
     close $f
     lappend x [viewFile test3]
-    removeFile test3
-    set x
 } {zzy abzzy}
 if {![file exists ~/_test_] && [file writable ~]} {
     test io-40.16 {tilde substitution in open} {
-	set test [makeFile {} _test_ ~]
-	set f [open $test w]
+	set f [open ~/_test_ w]
 	puts $f "Some text"
 	close $f
 	set x [file exists [file join $env(HOME) _test_]]
-	removeFile _test_ ~
+	removeFile [file join $env(HOME) _test_]
 	set x
     } 1
 }
@@ -5727,8 +5321,7 @@ test io-41.5 {Tcl_FileeventCmd: errors} {
 # Test fileevent on a file
 #
 
-set foo [makeFile {} foo]
-set f [open $foo w+]
+set f [open foo w+]
 
 test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} {
     list [fileevent $f readable] [fileevent $f writable]
@@ -5831,7 +5424,7 @@ test io-44.4 {FileEventProc procedure: eror in write event} {stdio unixExecs} {
     list $x [fileevent $f2 writable]
 } {bad-write {}}
 test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs} {
-    set f4 [open "|[list [interpreter] cat << $foo]" r]
+    set f4 [open "|[list [interpreter] cat << foo]" r]
     fileevent $f4 readable [namespace code {
 	if {[gets $f4 line] < 0} {
 	    lappend x eof
@@ -5845,17 +5438,16 @@ test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs} {
     vwait [namespace which -variable x]
     close $f4
     set x
-} "initial $foo eof"
+} {initial foo eof}
 
 catch {close $f2}
 catch {close $f3}
 
 
 close $f
-removeFile foo
+makeFile "foo bar" foo
 test io-45.1 {DeleteFileEvent, cleanup on close} {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
+    set f [open foo r]
     fileevent $f readable [namespace code {
 	lappend x "binding triggered: \"[gets $f]\""
 	fileevent $f readable {}
@@ -5865,13 +5457,11 @@ test io-45.1 {DeleteFileEvent, cleanup on close} {
     after 100 [namespace code { set y done }]
     variable y
     vwait [namespace which -variable y]
-    removeFile foo
     set x
 } {initial}
 test io-45.2 {DeleteFileEvent, cleanup on close} {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
     fileevent $f readable [namespace code {
 	    lappend x "f triggered: \"[gets $f]\""
 	    fileevent $f readable {}
@@ -5884,14 +5474,12 @@ test io-45.2 {DeleteFileEvent, cleanup on close} {
     variable x initial
     vwait [namespace which -variable x]
     close $f2
-    removeFile foo
     set x
 } {initial {f2 triggered: "foo bar"}}
 test io-45.3 {DeleteFileEvent, cleanup on close} {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
-    set f3 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
+    set f3 [open foo r]
     fileevent $f readable {f script}
     fileevent $f2 readable {f2 script}
     fileevent $f3 readable {f3 script}
@@ -5908,8 +5496,6 @@ test io-45.3 {DeleteFileEvent, cleanup on close} {
     lappend x [catch {fileevent $f readable}] \
 	    [catch {fileevent $f2 readable}] \
 	    [catch {fileevent $f3 readable}]
-    removeFile foo
-    set x
 } {0 {f script} 1 0 {f3 script} 0 {f script} 1 1 1 1 1}
 
 # Execute these tests only if the "testfevent" command is present.
@@ -5918,9 +5504,7 @@ testConstraint testfevent [llength [info commands testfevent]]
 test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent} {
     testfevent create
     testfevent cmd {
-	package require tcltest
-	set foo [::tcltest::makeFile {foo bar} foo]
-        set f [open $foo r]
+        set f [open foo r]
         set x "no event"
         fileevent $f readable [namespace code {
             set x "f triggered: [gets $f]"
@@ -5929,7 +5513,7 @@ test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent} {
     }
     after 1	;# We must delay because Windows takes a little time to notice
     update
-    testfevent cmd {close $f; ::tcltest::removeFile foo}
+    testfevent cmd {close $f}
     list [testfevent cmd {set x}] [testfevent cmd {info commands after}]
 } {{f triggered: foo bar} after}
 test io-46.2 {Tcl event loop vs multiple interpreters} testfevent {
@@ -5956,10 +5540,9 @@ test io-46.3 {Tcl event loop vs multiple interpreters} testfevent {
 } {0 0 {0 timer}}
 
 test io-47.1 {fileevent vs multiple interpreters} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
-    set f3 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
+    set f3 [open foo r]
     fileevent $f readable {script 1}
     testfevent create
     testfevent share $f2
@@ -5973,15 +5556,13 @@ test io-47.1 {fileevent vs multiple interpreters} testfevent {
     close $f
     close $f2
     close $f3
-    removeFile foo
     set x
 } {{} {script 1} {} {sript 3}}
 test io-47.2 {deleting fileevent on interpreter delete} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
-    set f3 [open $foo r]
-    set f4 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
+    set f3 [open foo r]
+    set f4 [open foo r]
     fileevent $f readable {script 1}
     testfevent create
     testfevent share $f2
@@ -5996,15 +5577,13 @@ test io-47.2 {deleting fileevent on interpreter delete} testfevent {
     close $f2
     close $f3
     close $f4
-    removeFile foo
     set x
 } {{script 1} {} {} {script 4}}
 test io-47.3 {deleting fileevent on interpreter delete} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
-    set f3 [open $foo r]
-    set f4 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
+    set f3 [open foo r]
+    set f4 [open foo r]
     testfevent create
     testfevent share $f3
     testfevent share $f4
@@ -6019,13 +5598,11 @@ test io-47.3 {deleting fileevent on interpreter delete} testfevent {
     close $f2
     close $f3
     close $f4
-    removeFile foo
     set x
 } {{script 1} {script 2} {} {}}
 test io-47.4 {file events on shared files and multiple interpreters} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
-    set f2 [open $foo r]
+    set f [open foo r]
+    set f2 [open foo r]
     testfevent create
     testfevent share $f
     testfevent cmd "fileevent $f readable {script 1}"
@@ -6037,12 +5614,10 @@ test io-47.4 {file events on shared files and multiple interpreters} testfevent
     testfevent delete
     close $f
     close $f2
-    removeFile foo
     set x
 } {{script 3} {script 1} {script 2}}
 test io-47.5 {file events on shared files, deleting file events} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
+    set f [open foo r]
     testfevent create
     testfevent share $f
     testfevent cmd "fileevent $f readable {script 1}"
@@ -6052,12 +5627,10 @@ test io-47.5 {file events on shared files, deleting file events} testfevent {
                 [fileevent $f readable]]
     testfevent delete
     close $f
-    removeFile foo
     set x
 } {{} {script 2}}
 test io-47.6 {file events on shared files, deleting file events} testfevent {
-    set foo [makeFile {foo bar} foo]
-    set f [open $foo r]
+    set f [open foo r]
     testfevent create
     testfevent share $f
     testfevent cmd "fileevent $f readable {script 1}"
@@ -6067,20 +5640,18 @@ test io-47.6 {file events on shared files, deleting file events} testfevent {
                 [fileevent $f readable]]
     testfevent delete
     close $f
-    removeFile foo
     set x
 } {{script 1} {}}
 
 test io-48.1 {testing readability conditions} {
-    set bar [makeFile {} bar]
-    set f [open $bar w]
+    set f [open bar w]
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     close $f
-    set f [open $bar r]
+    set f [open bar r]
     fileevent $f readable [namespace code [list consume $f]]
     proc consume {f} {
 	variable l
@@ -6096,19 +5667,17 @@ test io-48.1 {testing readability conditions} {
     set l ""
     variable x not_done
     vwait [namespace which -variable x]
-    removeFile bar
     list $x $l
 } {done {called called called called called called called}}
 test io-48.2 {testing readability conditions} {nonBlockFiles} {
-    set bar [makeFile {} bar]
-    set f [open $bar w]
+    set f [open bar w]
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     close $f
-    set f [open $bar r]
+    set f [open bar r]
     fileevent $f readable [namespace code [list consume $f]]
     fconfigure $f -blocking off
     proc consume {f} {
@@ -6125,19 +5694,18 @@ test io-48.2 {testing readability conditions} {nonBlockFiles} {
     set l ""
     variable x not_done
     vwait [namespace which -variable x]
-    removeFile bar
     list $x $l
 } {done {called called called called called called called}}
 test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} {
-    set bar [makeFile {} bar]
-    set f [open $bar w]
+    set f [open bar w]
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     puts $f abcdefg
     close $f
-    set my_script [makeFile {
+    set f [open my_script w]
+    puts $f {
 	proc copy_slowly {f} {
 	    while {![eof $f]} {
 		puts [gets $f]
@@ -6145,7 +5713,8 @@ test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} {
 	    }
 	    close $f
 	}
-    } my_script]
+    }
+    close $f
     set f [open "|[list [interpreter]]" r+]
     fileevent $f readable [namespace code [list consume $f]]
     fconfigure $f -buffering line
@@ -6164,20 +5733,17 @@ test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} {
     }
     set l ""
     variable x not_done
-    puts $f [list source $my_script]
-    puts $f [list set bar $bar]
-    puts $f {set f [open $bar r]}
+    puts $f {source my_script}
+    puts $f {set f [open bar r]}
     puts $f {copy_slowly $f}
     puts $f {exit}
     vwait [namespace which -variable x]
     close $f
-    removeFile bar
-    removeFile my_script
     list $x $l
 } {done {0 1 0 1 0 1 0 1 0 1 0 1 0 0}}
 test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6196,17 +5762,16 @@ test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6225,17 +5790,16 @@ test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6254,17 +5818,16 @@ test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6283,17 +5846,16 @@ test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6312,17 +5874,16 @@ test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation auto -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6341,17 +5902,16 @@ test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation auto
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6370,17 +5930,16 @@ test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation lf
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6399,17 +5958,16 @@ test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation lf -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6428,17 +5986,16 @@ test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation cr
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation cr
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6457,17 +6014,16 @@ test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation cr -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format "abc\ndef\n%cfoo\nbar\n" 26]
     puts -nonewline $f $c
@@ -6486,17 +6042,16 @@ test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -eofchar \x1a -translation crlf
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation crlf
     set c [format "abc\ndef\n%c" 26]
     puts -nonewline $f $c
@@ -6515,24 +6070,23 @@ test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {
     }
     set c 0
     set l ""
-    set f [open $test1 r]
+    set f [open test1 r]
     fconfigure $f -translation crlf -eofchar \x1a
     fileevent $f readable [namespace code [list consume $f]]
     variable x
     vwait [namespace which -variable x]
-    removeFile test1
     list $c $l
 } {3 {abc def {}}}
 
 test io-49.1 {testing crlf reading, leftover cr disgorgment} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\rb\rc\r\n"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f -translation crlf
     lappend l [read $f 1]
     lappend l [tell $f]
@@ -6550,19 +6104,18 @@ test io-49.1 {testing crlf reading, leftover cr disgorgment} {
     lappend l [read $f 1]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "7 a 1 [list \r] 2 b 3 [list \r] 4 c 5 {
 } 7 0 {} 1"
 test io-49.2 {testing crlf reading, leftover cr disgorgment} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\rb\rc\r\n"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f -translation crlf
     lappend l [read $f 2]
     lappend l [tell $f]
@@ -6575,18 +6128,17 @@ test io-49.2 {testing crlf reading, leftover cr disgorgment} {
     lappend l [tell $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "7 [list a\r] 2 [list b\r] 4 [list c\n] 7 0 {} 7 1"
 test io-49.3 {testing crlf reading, leftover cr disgorgment} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\rb\rc\r\n"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f -translation crlf
     lappend l [read $f 3]
     lappend l [tell $f]
@@ -6597,18 +6149,17 @@ test io-49.3 {testing crlf reading, leftover cr disgorgment} {
     lappend l [tell $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "7 [list a\rb] 3 [list \rc\n] 7 0 {} 7 1"
 test io-49.4 {testing crlf reading, leftover cr disgorgment} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\rb\rc\r\n"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f -translation crlf
     lappend l [read $f 3]
     lappend l [tell $f]
@@ -6619,18 +6170,17 @@ test io-49.4 {testing crlf reading, leftover cr disgorgment} {
     lappend l [tell $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } "7 [list a\rb] 3 [list \rc] 7 0 {} 7 1"
 test io-49.5 {testing crlf reading, leftover cr disgorgment} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     fconfigure $f -translation lf
     puts -nonewline $f "a\rb\rc\r\n"
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     set l ""
-    lappend l [file size $test1]
+    lappend l [file size test1]
     fconfigure $f -translation crlf
     lappend l [set x [gets $f]]
     lappend l [tell $f]
@@ -6638,16 +6188,15 @@ test io-49.5 {testing crlf reading, leftover cr disgorgment} {
     lappend l [tell $f]
     lappend l [eof $f]
     close $f
-    removeFile test1
     set l
 } [list 7 a\rb\rc 7 {} 7 1]
     
 testConstraint testchannelevent [llength [info commands testchannelevent]]
 test io-50.1 {testing handler deletion} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list delhandler $f]]
     proc delhandler {f} {
 	variable z
@@ -6657,14 +6206,13 @@ test io-50.1 {testing handler deletion} {testchannelevent} {
     set z not_called
     update
     close $f
-    removeFile test1
     set z
 } called
 test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list delhandler $f 1]]
     testchannelevent $f add readable [namespace code [list delhandler $f 0]]
     proc delhandler {f i} {
@@ -6675,15 +6223,14 @@ test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent
     set z ""
     update
     close $f
-    removeFile test1
     string compare [string tolower $z] \
 	[list [list called delhandler $f 0] [list called delhandler $f 1]]
 } 0
 test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list notcalled $f 1]]
     testchannelevent $f add readable [namespace code [list delhandler $f 0]]
     set z ""
@@ -6701,16 +6248,15 @@ test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent
     set z ""
     update
     close $f
-    removeFile test1
     string compare [string tolower $z] \
 	[list [list delhandler $f 0 called] \
 	      [list delhandler $f 0 deleted myself]]
 } 0
 test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list delrecursive $f]]
     proc delrecursive {f} {
 	variable z
@@ -6728,15 +6274,14 @@ test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} {
     set z ""
     update
     close $f
-    removeFile test1
     string compare [string tolower $z] \
 	{{delrecursive calling recursive} {delrecursive deleting recursive}}
 } 0
 test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list notcalled $f]]
     testchannelevent $f add readable [namespace code [list del $f]]
     proc notcalled {f} {
@@ -6762,16 +6307,15 @@ test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} {
     set u toplevel
     update
     close $f
-    removeFile test1
     string compare [string tolower $z] \
 	[list {del calling recursive} {del deleted notcalled} \
 	      {del deleted myself} {del after update}]
 } 0
 test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} {
-    set test1 [makeFile {} test1]
-    set f [open $test1 w]
+    removeFile test1
+    set f [open test1 w]
     close $f
-    set f [open $test1 r]
+    set f [open test1 r]
     testchannelevent $f add readable [namespace code [list second $f]]
     testchannelevent $f add readable [namespace code [list first $f]]
     proc first {f} {
@@ -6805,7 +6349,6 @@ test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} {
     set u toplevel
     update
     close $f
-    removeFile test1
     string compare [string tolower $z] \
 	[list {first called} {first called not toplevel} \
 	      {second called, first time} {second called, second time} \
@@ -6852,33 +6395,31 @@ test io-51.1 {Test old socket deletion on Macintosh} {socket} {
 } {sock1 sock2 sock3 sock4}
 
 test io-52.1 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fcopy $f1 $f2 -command { # }
     catch { fcopy $f1 $f2 } msg
     close $f1
     close $f2
-    removeFile test1
     string compare $msg "channel \"$f1\" is busy"
 } {0}
 test io-52.2 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     set f3 [open $thisScript]
     fcopy $f1 $f2 -command { # }
     catch { fcopy $f3 $f2 } msg
     close $f1
     close $f2
     close $f3
-    removeFile test1
     string compare $msg "channel \"$f2\" is busy"
 } {0}
 test io-52.3 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation cr -blocking 0
     set s0 [fcopy $f1 $f2]
@@ -6886,31 +6427,28 @@ test io-52.3 {TclCopyChannel} {
     close $f1
     close $f2
     set s1 [file size $thisScript]
-    set s2 [file size $test1]
+    set s2 [file size test1]
     if {("$s1" == "$s2") && ($s0 == $s1)} {
         lappend result ok
     }
-    removeFile test1
     set result
 } {0 0 ok}
 test io-52.4 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation cr -blocking 0
     fcopy $f1 $f2 -size 40
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     close $f1
     close $f2
-    lappend result [file size $test1]
-    removeFile test1
-    set result
+    lappend result [file size test1]
 } {0 0 40}
 test io-52.5 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation lf -blocking 0
     fcopy $f1 $f2 -size -1
@@ -6918,17 +6456,16 @@ test io-52.5 {TclCopyChannel} {
     close $f1
     close $f2
     set s1 [file size $thisScript]
-    set s2 [file size $test1]
+    set s2 [file size test1]
     if {"$s1" == "$s2"} {
         lappend result ok
     }
-    removeFile test1
     set result
 } {0 0 ok}
 test io-52.6 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation lf -blocking 0
     set s0 [fcopy $f1 $f2 -size [expr [file size $thisScript] + 5]]
@@ -6936,72 +6473,72 @@ test io-52.6 {TclCopyChannel} {
     close $f1
     close $f2
     set s1 [file size $thisScript]
-    set s2 [file size $test1]
+    set s2 [file size test1]
     if {("$s1" == "$s2") && ($s0 == $s1)} {
         lappend result ok
     }
-    removeFile test1
     set result
 } {0 0 ok}
 test io-52.7 {TclCopyChannel} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation lf -blocking 0
     fcopy $f1 $f2
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     set s1 [file size $thisScript]
-    set s2 [file size $test1]
+    set s2 [file size test1]
     close $f1
     close $f2
     if {"$s1" == "$s2"} {
         lappend result ok
     }
-    removeFile test1
     set result
 } {0 0 ok}
 test io-52.8 {TclCopyChannel} {stdio} {
-    set test1 [makeFile {} test1]
-    set pipe [makeFile "
+    removeFile test1
+    removeFile pipe
+    set f1 [open pipe w]
+    fconfigure $f1 -translation lf
+    puts $f1 "
 	puts ready
 	gets stdin
 	set f1 \[open [list $thisScript] r\]
 	fconfigure \$f1 -translation lf
 	puts \[read \$f1 100\]
 	close \$f1
-    " pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    "
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     fconfigure $f1 -translation lf
     gets $f1
     puts $f1 ready
     flush $f1
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f2 -translation lf
     set s0 [fcopy $f1 $f2 -size 40]
     catch {close $f1}
     close $f2
-    removeFile pipe
-    set x [list $s0 [file size $test1]]
-    removeFile test1
-    set x
+    list $s0 [file size test1]
 } {40 40}
 
+# Empty files, to register them with the test facility
+makeFile {} kyrillic.txt
+makeFile {} utf8-fcopy.txt
+makeFile {} utf8-rp.txt
 
 # Create kyrillic file, use lf translation to avoid os eol issues
-set kyrillic [makeFile {} kyrillic.txt]
-set out [open $kyrillic w]
+set out [open kyrillic.txt w]
 fconfigure $out -encoding koi8-r -translation lf
 puts       $out "\u0410\u0410"
 close      $out
-set uf [makeFile {} utf8-fcopy.txt]
-set ur [makeFile {} utf8-rp.txt]
 
 test io-52.9 {TclCopyChannel & encodings} {
     # Copy kyrillic to UTF-8, using fcopy.
 
-    set in  [open $kyrillic r]
-    set out [open $uf w]
+    set in  [open kyrillic.txt r]
+    set out [open utf8-fcopy.txt w]
 
     fconfigure $in  -encoding koi8-r -translation lf
     fconfigure $out -encoding utf-8 -translation lf
@@ -7012,8 +6549,8 @@ test io-52.9 {TclCopyChannel & encodings} {
 
     # Do the same again, but differently (read/puts).
 
-    set in  [open $kyrillic r]
-    set out [open $ur w]
+    set in  [open kyrillic.txt r]
+    set out [open utf8-rp.txt w]
 
     fconfigure $in  -encoding koi8-r -translation lf
     fconfigure $out -encoding utf-8 -translation lf
@@ -7023,16 +6560,17 @@ test io-52.9 {TclCopyChannel & encodings} {
     close $in
     close $out
 
-    list [file size $kyrillic] [file size $uf] [file size $ur]
+    list [file size kyrillic.txt] \
+	    [file size utf8-fcopy.txt] \
+	    [file size utf8-rp.txt]
 } {3 5 5}
-removeFile utf8-rp.txt
 
 test io-52.10 {TclCopyChannel & encodings} {
     # encoding to binary (=> implies that the
     # internal utf-8 is written)
 
-    set in  [open $kyrillic r]
-    set out [open $uf w]
+    set in  [open kyrillic.txt r]
+    set out [open utf8-fcopy.txt w]
 
     fconfigure $in  -encoding koi8-r -translation lf
     # -translation binary is also -encoding binary
@@ -7042,15 +6580,15 @@ test io-52.10 {TclCopyChannel & encodings} {
     close $in
     close $out
 
-    file size $uf
+    file size utf8-fcopy.txt
 } 5
 
 test io-52.11 {TclCopyChannel & encodings} {
     # binary to encoding => the input has to be
     # in utf-8 to make sense to the encoder
 
-    set in  [open $uf r]
-    set out [open $kyrillic w]
+    set in  [open utf8-fcopy.txt r]
+    set out [open kyrillic.txt w]
 
     # -translation binary is also -encoding binary
     fconfigure $in  -translation binary
@@ -7060,29 +6598,26 @@ test io-52.11 {TclCopyChannel & encodings} {
     close $in
     close $out
 
-    set size [file size $kyrillic]
+    file size kyrillic.txt
 } 3
-removeFile utf8-fcopy.txt
-removeFile kyrillic.txt
+
 
 test io-53.1 {CopyData} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation cr -blocking 0
     fcopy $f1 $f2 -size 0
     set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
     close $f1
     close $f2
-    lappend result [file size $test1]
-    removeFile test1
-    set result
+    lappend result [file size test1]
 } {0 0 0}
 test io-53.2 {CopyData} {
-    set test1 [makeFile {} test1]
+    removeFile test1
     set f1 [open $thisScript]
-    set f2 [open $test1 w]
+    set f2 [open test1 w]
     fconfigure $f1 -translation lf -blocking 0
     fconfigure $f2 -translation cr -blocking 0
     fcopy $f1 $f2 -command [namespace code {set s0}]
@@ -7092,26 +6627,28 @@ test io-53.2 {CopyData} {
     close $f1
     close $f2
     set s1 [file size $thisScript]
-    set s2 [file size $test1]
+    set s2 [file size test1]
     if {("$s1" == "$s2") && ($s0 == $s1)} {
         lappend result ok
     }
-    removeFile test1
     set result
 } {0 0 ok}
 test io-53.3 {CopyData: background read underflow} {stdio unixOnly} {
-    set test1 [makeFile {} test1]
-    set pipe [makeFile {
+    removeFile test1
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	puts ready
 	flush stdout				;# Don't assume line buffered!
 	fcopy stdin stdout -command { set x }
 	vwait x
-	set f [open [file join [file dirname [info script]] test1] w]
+	set f [open test1 w]
 	fconfigure $f -translation lf
 	puts $f "done"
 	close $f
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    }
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     set result [gets $f1]
     puts $f1 line1
     flush $f1
@@ -7121,30 +6658,31 @@ test io-53.3 {CopyData: background read underflow} {stdio unixOnly} {
     lappend result [gets $f1]
     close $f1
     after 500
-    set f [open $test1]
+    set f [open test1]
     lappend result [read $f]
     close $f
-    removeFile pipe
-    removeFile test1
     set result
 } "ready line1 line2 {done\n}"
 test io-53.4 {CopyData: background write overflow} {stdio unixOnly} {
-    set test1 [makeFile {} test1]
     set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n
     variable x
     for {set x 0} {$x < 12} {incr x} {
 	append big $big
     }
-    set pipe [makeFile {
+    removeFile test1
+    removeFile pipe
+    set f1 [open pipe w]
+    puts $f1 {
 	puts ready
 	fcopy stdin stdout -command { set x }
 	vwait x
-	set f [open [file join [file dirname [info script]] test1] w]
+	set f [open test1 w]
 	fconfigure $f -translation lf
 	puts $f "done"
 	close $f
-    } pipe]
-    set f1 [open "|[list [interpreter] $pipe]" r+]
+    }
+    close $f1
+    set f1 [open "|[list [interpreter] pipe]" r+]
     set result [gets $f1]
     fconfigure $f1 -blocking 0
     puts $f1 $big
@@ -7160,7 +6698,6 @@ test io-53.4 {CopyData: background write overflow} {stdio unixOnly} {
     vwait [namespace which -variable x]
     close $f1
     set big {}
-    removeFile test1
     set x
 } done
 set result {}
@@ -7195,10 +6732,14 @@ test io-53.5 {CopyData: error during fcopy} {socket} {
 } 1
 test io-53.6 {CopyData: error during fcopy} {stdio} {
     variable fcopyTestDone
+    removeFile pipe
+    removeFile test1
     catch {unset fcopyTestDone}
-    set pipe [makeFile {exit 1} pipe]
-    set in [open "|[list [interpreter] $pipe]" r+]
-    set out [open [makeFile {} test1] w]
+    set f1 [open pipe w]
+    puts $f1 "exit 1"
+    close $f1
+    set in [open "|[list [interpreter] pipe]" r+]
+    set out [open test1 w]
     fcopy $in $out -command [namespace code FcopyTestDone]
     variable fcopyTestDone
     if ![info exists fcopyTestDone] {
@@ -7206,8 +6747,6 @@ test io-53.6 {CopyData: error during fcopy} {stdio} {
     }
     catch {close $in}
     close $out
-    removeFile test1
-    removeFile pipe
     set fcopyTestDone	;# 0 for plain end of file
 } {0}
 
@@ -7230,9 +6769,12 @@ proc doFcopy {in out {bytes 0} {error {}}} {
 
 test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio} {
     variable fcopyTestDone
+    removeFile pipe
+    removeFile test1
     catch {unset fcopyTestDone}
     set fcopyTestCount 0
-    set pipe [makeFile {
+    set f1 [open pipe w]
+    puts $f1 {
 	# Write  10 bytes / 10 msec
 	proc Write {count} {
 	    puts -nonewline "1234567890"
@@ -7246,9 +6788,10 @@ test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio} {
 	Write 345 ;# 3450 bytes ~3.45 sec
 	vwait ready
 	exit 0
-    } pipe]
-    set in [open "|[list [interpreter] $pipe &]" r+]
-    set out [open [makeFile {} test1] w]
+    }
+    close $f1
+    set in [open "|[list [interpreter] pipe &]" r+]
+    set out [open test1 w]
     doFcopy $in $out
     variable fcopyTestDone
     if ![info exists fcopyTestDone] {
@@ -7256,8 +6799,6 @@ test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio} {
     }
     catch {close $in}
     close $out
-    removeFile test1
-    removeFile pipe
     # -1=error 0=script error N=number of bytes
     expr ($fcopyTestDone == 0) ? $fcopyTestCount : -1
 } {3450}
@@ -7385,21 +6926,18 @@ test io-55.1 {ChannelEventScriptInvoker: deletion} {
 	set x whoops
     }
     proc ::bgerror {args} "set [namespace which -variable x] got_error"
-    set fooBar [makeFile {} fooBar]
-    set f [open $fooBar w]
+    set f [open fooBar w]
     fileevent $f writable [namespace code [list eventScript $f]]
     variable x not_done
     vwait [namespace which -variable x]
-    removeFile fooBar
     set x
 } {got_error}
 
 test io-56.1 {ChannelTimerProc} {testchannelevent} {
-    set fooBar [makeFile {} fooBar]
-    set f [open $fooBar w]
+    set f [open fooBar w]
     puts $f "this is a test"
     close $f
-    set f [open $fooBar r]
+    set f [open fooBar r]
     testchannelevent $f add readable [namespace code {
 	read $f 1
 	incr x
@@ -7413,7 +6951,6 @@ test io-56.1 {ChannelTimerProc} {testchannelevent} {
     variable y
     vwait [namespace which -variable y]
     close $f
-    removeFile fooBar
     lappend result $y
 } {2 done}
 
@@ -7465,11 +7002,12 @@ test io-57.2 {buffered data and file events, read} {
 } {1 readable 234567890 timer}
         
 test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc} {
-    set script [makeFile {
+    set out [open script w]
+    puts $out {
 	puts "normal message from pipe"
 	puts stderr "error message from pipe"
 	exit 1
-    } script]
+    }
     proc readit {pipe} {
 	variable x
 	variable result
@@ -7481,12 +7019,12 @@ test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc} {
 	    lappend result gets $line
 	}
     }
-    set pipe [open "|[list [interpreter]] $script" r]
+    close $out
+    set pipe [open "|[list [interpreter]] script" r]
     fileevent $pipe readable [namespace code [list readit $pipe]]
     variable x ""
     set result ""
     vwait [namespace which -variable x]
-    removeFile script
     list $x $result
 } {1 {gets {normal message from pipe} gets {} catch {error message from pipe}}}
 
@@ -7499,15 +7037,17 @@ test io-59.1 {Thread reference of channels} {testmainthread testchannel} {
     # extension which fully implements the moving of channels between
     # threads, i.e. 'Threads'. Or we have to extend [testthread] as well.
 
-    set f [open $longfile r]
+    set f [open longfile r]
     set result [testchannel mthread $f]
     close $f
     string equal $result [testmainthread]
 } {1}
 
 # cleanup
-removeFile longfile
-removeFile cat
+foreach file [list fooBar longfile script output test1 pipe my_script foo \
+	bar test2 test3 cat stdout] {
+    removeFile $file
+}
 cleanupTests
 }
 namespace delete ::tcl::test::io
-- 
cgit v0.12