diff options
Diffstat (limited to 'tcl/tests/io.test')
| -rw-r--r-- | tcl/tests/io.test | 2807 |
1 files changed, 1592 insertions, 1215 deletions
diff --git a/tcl/tests/io.test b/tcl/tests/io.test index 772f67dbd55..3b6a43cf7cd 100644 --- a/tcl/tests/io.test +++ b/tcl/tests/io.test @@ -14,27 +14,34 @@ # # RCS: @(#) $Id$ -if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest - namespace import -force ::tcltest::* -} - -if {"[info commands testchannel]" != "testchannel"} { - puts "Skipping io tests. This application does not seem to have the" - puts "testchannel command that is needed to run these tests." +if {[catch {package require tcltest 2}]} { + puts stderr "Skipping tests in [info script]. tcltest 2 required." return } +namespace eval ::tcl::test::io { + + namespace import ::tcltest::cleanupTests + namespace import ::tcltest::interpreter + namespace import ::tcltest::makeFile + namespace import ::tcltest::removeFile + namespace import ::tcltest::test + namespace import ::tcltest::testConstraint + namespace import ::tcltest::viewFile -::tcltest::saveState +testConstraint testchannel [llength [info commands testchannel]] +testConstraint exec [llength [info commands exec]] + +# You need a *very* special environment to do some tests. In +# particular, many file systems do not support large-files... +testConstraint largefileSupport 0 removeFile test1 removeFile pipe -catch {unset u} - # set up a long data file for some of the following tests -set f [open longfile w] +set path(longfile) [makeFile {} longfile] +set f [open $path(longfile) w] fconfigure $f -eofchar {} -translation lf for { set i 0 } { $i < 100 } { incr i} { puts $f "#123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef @@ -43,7 +50,7 @@ for { set i 0 } { $i < 100 } { incr i} { } close $f -makeFile { +set path(cat) [makeFile { set f stdin if {$argv != ""} { set f [open $argv] @@ -60,7 +67,7 @@ makeFile { } } vwait forever -} cat +} cat] set thisScript [file join [pwd] [info script]] @@ -75,116 +82,135 @@ proc contents {file} { test io-1.5 {Tcl_WriteChars: CheckChannelErrors} {emptyTest} { # no test, need to cause an async error. } {} + +set path(test1) [makeFile {} test1] + test io-1.6 {Tcl_WriteChars: WriteBytes} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary puts -nonewline $f "a\u4e4d\0" close $f - contents test1 + contents $path(test1) } "a\x4d\x00" test io-1.7 {Tcl_WriteChars: WriteChars} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding shiftjis puts -nonewline $f "a\u4e4d\0" close $f - contents test1 + contents $path(test1) } "a\x93\xe1\x00" +set path(test2) [makeFile {} test2] + +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 $path(test2) w] + fconfigure $f -encoding iso2022-jp + puts -nonewline $f [format %s%c [string repeat " " 4] 12399] + close $f + contents $path(test2) +} " \x1b\$B\$O\x1b(B" + test io-2.1 {WriteBytes} { # loop until all bytes are written - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary -buffersize 16 -translation crlf puts $f "abcdefghijklmnopqrstuvwxyz" close $f - contents test1 + contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary -buffersize 16 -translation crlf puts -nonewline $f "123456789012345\n12" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary -buffering line -translation crlf puts -nonewline $f "\n12" - set x [contents test1] + set x [contents $path(test1)] close $f set x } "\r\n12" test io-2.4 {WriteBytes: reset sawLF after each buffer} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary -buffering line -translation lf \ -buffersize 16 puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"] test io-3.1 {WriteChars: compatibility with WriteBytes} { # loop until all bytes are written - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding ascii -buffersize 16 -translation crlf puts $f "abcdefghijklmnopqrstuvwxyz" close $f - contents test1 + contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding ascii -buffersize 16 -translation crlf puts -nonewline $f "123456789012345\n12" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding ascii -buffering line -translation crlf puts -nonewline $f "\n12" - set x [contents test1] + set x [contents $path(test1)] close $f 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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding jis0208 -buffersize 16 puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding jis0208 -buffersize 17 puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"] test io-3.6 {WriteChars: (stageRead + dstWrote == 0)} { # One incomplete UTF-8 character at end of staging buffer. Backup @@ -196,12 +222,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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding shiftjis -buffersize 16 puts -nonewline $f "12345678901234\uff21\uff22" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 @@ -210,121 +236,121 @@ 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 test1 w] + set f [open $path(test1) w] fconfigure $f -encoding jis0208 -buffersize 17 puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"] test io-3.8 {WriteChars: reset sawLF after each buffer} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding ascii -buffering line -translation lf \ -buffersize 16 puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"] test io-4.1 {TranslateOutputEOL: lf} { # search for \n - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering line -translation lf puts $f "abcde" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "abcde\n" "abcde\n"] test io-4.2 {TranslateOutputEOL: cr} { # search for \n, replace with \r - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering line -translation cr puts $f "abcde" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "abcde\r" "abcde\r"] test io-4.3 {TranslateOutputEOL: crlf} { # simple case: search for \n, replace with \r - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering line -translation crlf puts $f "abcde" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf -buffersize 16 puts -nonewline $f "1234567\n\n\n\n\nA" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(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 test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf -buffersize 12 puts -nonewline $f "12345678901\n456789012345678901234" close $f - set x [contents test1] + set x [contents $path(test1)] } "12345678901\r\n456789012345678901234" test io-5.1 {CheckFlush: not full} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f puts -nonewline $f "12345678901234567890" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "" "12345678901234567890"] test io-5.2 {CheckFlush: full} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffersize 16 puts -nonewline $f "12345678901234567890" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "1234567890123456" "12345678901234567890"] test io-5.3 {CheckFlush: not line} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering line puts -nonewline $f "12345678901234567890" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "" "12345678901234567890"] test io-5.4 {CheckFlush: line} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering line -translation lf -encoding ascii puts -nonewline $f "1234567890\n1234567890" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "1234567890\n1234567890" "1234567890\n1234567890"] test io-5.5 {CheckFlush: none} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffering none puts -nonewline $f "1234567890" - set x [list [contents test1]] + set x [list [contents $path(test1)]] close $f - lappend x [contents test1] + lappend x [contents $path(test1)] } [list "1234567890" "1234567890"] test io-6.1 {Tcl_GetsObj: working} { - set f [open test1 w] + set f [open $path(test1) w] puts $f "foo\nboo" close $f - set f [open test1] + set f [open $path(test1)] set x [gets $f] close $f set x @@ -335,32 +361,32 @@ 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 f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f "abc\ndefg" close $f - set f [open test1] + set f [open $path(test1)] set x [list [tell $f] [gets $f line] [tell $f] [gets $f line] $line] close $f set x } {0 3 5 4 defg} test io-6.4 {Tcl_GetsObj: encoding == NULL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation binary puts $f "\x81\u1234\0" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation binary set x [list [gets $f line] $line] close $f set x } [list 3 "\x81\x34\x00"] test io-6.5 {Tcl_GetsObj: encoding != NULL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation binary puts $f "\x88\xea\x92\x9a" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -encoding shiftjis set x [list [gets $f line] $line] close $f @@ -372,11 +398,11 @@ append a $a test io-6.6 {Tcl_GetsObj: loop test} { # if (dst >= dstEnd) - set f [open test1 w] + set f [open $path(test1) w] puts $f $a puts $f hi close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f line] $line] close $f set x @@ -384,7 +410,7 @@ test io-6.6 {Tcl_GetsObj: loop test} { test io-6.7 {Tcl_GetsObj: error in input} {stdio} { # if (FilterInputBytes(chanPtr, &gs) != 0) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] cat]" w+] puts -nonewline $f "hi\nwould" flush $f gets $f @@ -394,20 +420,20 @@ 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 f [open test1 w] + set f [open $path(test1) w] puts $f "abcdef\x1aghijk\nwombat" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -eofchar \x1a set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {6 abcdef -1 {}} test io-6.9 {Tcl_GetsObj: remember if EOF is seen} { - set f [open test1 w] + set f [open $path(test1) w] puts $f "abcdefghijk\nwom\u001abat" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -eofchar \x1a set x [list [gets $f line] $line [gets $f line] $line] close $f @@ -417,236 +443,236 @@ test io-6.9 {Tcl_GetsObj: remember if EOF is seen} { # Comprehensive tests test io-6.10 {Tcl_GetsObj: lf mode: no chars} { - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation lf set x [list [gets $f line] $line] close $f set x } {-1 {}} test io-6.11 {Tcl_GetsObj: lf mode: lone \n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation lf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {0 {} -1 {}} test io-6.12 {Tcl_GetsObj: lf mode: lone \r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation lf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 1 "\r" -1 ""] test io-6.13 {Tcl_GetsObj: lf mode: 1 char} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f a close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation lf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.14 {Tcl_GetsObj: lf mode: 1 char followed by EOL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation lf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.15 {Tcl_GetsObj: lf mode: several chars} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" close $f - set f [open test1] + set f [open $path(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 set x } [list 4 "abcd" 10 "efgh\rijkl\r" 4 "mnop" -1 ""] test io-6.16 {Tcl_GetsObj: cr mode: no chars} { - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [list [gets $f line] $line] close $f set x } {-1 {}} test io-6.17 {Tcl_GetsObj: cr mode: lone \n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 1 "\n" -1 ""] test io-6.18 {Tcl_GetsObj: cr mode: lone \r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {0 {} -1 {}} test io-6.19 {Tcl_GetsObj: cr mode: 1 char} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f a close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.20 {Tcl_GetsObj: cr mode: 1 char followed by EOL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.21 {Tcl_GetsObj: cr mode: several chars} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" close $f - set f [open test1] + set f [open $path(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 set x } [list 9 "abcd\nefgh" 4 "ijkl" 5 "\nmnop" -1 ""] test io-6.22 {Tcl_GetsObj: crlf mode: no chars} { - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line] close $f set x } {-1 {}} test io-6.23 {Tcl_GetsObj: crlf mode: lone \n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 1 "\n" -1 ""] test io-6.24 {Tcl_GetsObj: crlf mode: lone \r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 1 "\r" -1 ""] test io-6.25 {Tcl_GetsObj: crlf mode: \r\r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 2 "\r\r" -1 ""] test io-6.26 {Tcl_GetsObj: crlf mode: \r\n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 0 "" -1 ""] test io-6.27 {Tcl_GetsObj: crlf mode: 1 char} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f a close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.28 {Tcl_GetsObj: crlf mode: 1 char followed by EOL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\r\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.29 {Tcl_GetsObj: crlf mode: several chars} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] close $f set x } [list 14 "abcd\nefgh\rijkl" 4 "mnop" -1 ""] -test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} { +test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} {testchannel} { # if (eol >= dstEnd) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\r\nabcdefghijklmnoprstuvwxyz" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf -buffersize 16 set x [list [gets $f line] $line [testchannel inputbuffered $f]] close $f set x } [list 15 "123456789012345" 15] -test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio} { +test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio testchannel} { # (FilterInputBytes() != 0) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {crlf lf} -buffering none puts -nonewline $f "bbbbbbbbbbbbbb\r\n123456789012345\r" fconfigure $f -buffersize 16 @@ -656,14 +682,14 @@ test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio} { close $f set x } [list "bbbbbbbbbbbbbb" -1 "" 1 16] -test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} { +test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} {testchannel} { # not (FilterInputBytes() != 0) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\r\n123" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf -buffersize 16 set x [list [gets $f line] $line [tell $f] [testchannel inputbuffered $f]] close $f @@ -672,11 +698,11 @@ test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} { test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} { # eol still equals dstEnd - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf -buffersize 16 set x [list [gets $f line] $line [eof $f]] close $f @@ -685,107 +711,107 @@ test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} { test io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} { # not (*eol == '\n') - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\rabcd\r\nefg" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf -buffersize 16 set x [list [gets $f line] $line [tell $f]] close $f set x } [list 20 "123456789012345\rabcd" 22] test io-6.35 {Tcl_GetsObj: auto mode: no chars} { - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line] close $f set x } {-1 {}} test io-6.36 {Tcl_GetsObj: auto mode: lone \n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 0 "" -1 ""] test io-6.37 {Tcl_GetsObj: auto mode: lone \r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 0 "" -1 ""] test io-6.38 {Tcl_GetsObj: auto mode: \r\r} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] close $f set x } [list 0 "" 0 "" -1 ""] test io-6.39 {Tcl_GetsObj: auto mode: \r\n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "\r\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line] close $f set x } [list 0 "" -1 ""] test io-6.40 {Tcl_GetsObj: auto mode: 1 char} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f a close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.41 {Tcl_GetsObj: auto mode: 1 char followed by EOL} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\r\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [gets $f line] $line [gets $f line] $line] close $f set x } {1 a -1 {}} test io-6.42 {Tcl_GetsObj: auto mode: several chars} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" close $f - set f [open test1] + set f [open $path(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 set x } [list 4 "abcd" 4 "efgh" 4 "ijkl" 4 "mnop" -1 ""] -test io-6.43 {Tcl_GetsObj: input saw cr} {stdio} { +test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel} { # if (chanPtr->flags & INPUT_SAW_CR) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto lf} -buffering none puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" fconfigure $f -buffersize 16 @@ -799,10 +825,10 @@ test io-6.43 {Tcl_GetsObj: input saw cr} {stdio} { close $f set x } [list "bbbbbbbbbbbbbbb" 15 "123456789abcdef" 1 4 "abcd" 0 3 "efg"] -test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio} { +test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio testchannel} { # not (*eol == '\n') - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto lf} -buffering none puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" fconfigure $f -buffersize 16 @@ -816,10 +842,10 @@ test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio} { close $f set x } [list "bbbbbbbbbbbbbbb" 15 "123456789abcdef" 1 4 "abcd" 0 3 "efg"] -test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio} { +test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio testchannel} { # Tcl_ExternalToUtf() - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto lf} -buffering none fconfigure $f -encoding unicode puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" @@ -833,10 +859,10 @@ test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio} { close $f set x } [list 15 "123456789abcdef" 1 4 "abcd" 0] -test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {stdio} { +test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {stdio testchannel} { # memmove() - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto lf} -buffering none puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" fconfigure $f -buffersize 16 @@ -849,52 +875,52 @@ test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {s close $f set x } [list 15 "123456789abcdef" 1 -1 "" 0] -test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} { +test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} {testchannel} { # (eol == dstEnd) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\r\nabcdefghijklmnopq" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto -buffersize 16 set x [list [gets $f] [testchannel inputbuffered $f]] close $f set x } [list "123456789012345" 15] -test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} { +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 f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456789012345\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto -buffersize 16 set x [list [gets $f] [testchannel queuedcr $f]] close $f set x } [list "123456789012345" 1] -test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} { +test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} {testchannel} { # if (*eol == '\n') {skip++} - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456\r\n78901" close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] close $f set x } [list "123456" 0 8 "78901"] -test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} { +test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} {testchannel} { # not (*eol == '\n') - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456\r78901" close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] close $f set x @@ -902,23 +928,23 @@ test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} { test io-6.51 {Tcl_GetsObj: auto mode: \n} { # else if (*eol == '\n') {goto gotoeol;} - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456\n78901" close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f] [tell $f] [gets $f]] close $f set x } [list "123456" 7 "78901"] -test io-6.52 {Tcl_GetsObj: saw EOF character} { +test io-6.52 {Tcl_GetsObj: saw EOF character} {testchannel} { # if (eof != NULL) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "123456\x1ak9012345\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -eofchar \x1a set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] close $f @@ -927,9 +953,9 @@ test io-6.52 {Tcl_GetsObj: saw EOF character} { test io-6.53 {Tcl_GetsObj: device EOF} { # didn't produce any bytes - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f line] $line [eof $f]] close $f set x @@ -937,10 +963,10 @@ test io-6.53 {Tcl_GetsObj: device EOF} { test io-6.54 {Tcl_GetsObj: device EOF} { # got some bytes before EOF. - set f [open test1 w] + set f [open $path(test1) w] puts -nonewline $f abc close $f - set f [open test1] + set f [open $path(test1)] set x [list [gets $f line] $line [eof $f]] close $f set x @@ -948,11 +974,11 @@ test io-6.54 {Tcl_GetsObj: device EOF} { test io-6.55 {Tcl_GetsObj: overconverted} { # Tcl_ExternalToUtf(), make sure state updated - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding iso2022-jp puts $f "there\u4e00ok\n\u4e01more bytes\nhere" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -encoding iso2022-jp set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] close $f @@ -960,21 +986,21 @@ test io-6.55 {Tcl_GetsObj: overconverted} { } [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"] test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} { update - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -buffering none puts -nonewline $f "foobar" fconfigure $f -blocking 0 - set x {} - after 500 { lappend x timeout } - fileevent $f readable { lappend x [gets $f] } - vwait x - vwait x + variable x {} + after 500 [namespace code { lappend x timeout }] + fileevent $f readable [namespace code { lappend x [gets $f] }] + vwait [namespace which -variable x] + vwait [namespace which -variable x] fconfigure $f -blocking 1 puts -nonewline $f "baz\n" - after 500 { lappend x timeout } + after 500 [namespace code { lappend x timeout }] fconfigure $f -blocking 0 - vwait x - vwait x + vwait [namespace which -variable x] + vwait [namespace which -variable x] close $f set x } {{} timeout foobarbaz timeout} @@ -982,11 +1008,11 @@ 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 f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding shiftjis puts $f "1234567890123\uff10\uff11\uff12\uff13\uff14\nend" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -encoding shiftjis -buffersize 16 set x [gets $f] close $f @@ -995,22 +1021,22 @@ test io-7.1 {FilterInputBytes: split up character at end of buffer} { test io-7.2 {FilterInputBytes: split up character in middle of buffer} { # (bufPtr->nextAdded < bufPtr->bufLength) - set f [open test1 w] + set f [open $path(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 $path(test1)] fconfigure $f -encoding shiftjis set x [list [gets $f line] $line [eof $f]] close $f set x } [list 10 "1234567890" 0] -test io-7.3 {FilterInputBytes: split up character at EOF} { - set f [open test1 w] +test io-7.3 {FilterInputBytes: split up character at EOF} {testchannel} { + set f [open $path(test1) w] fconfigure $f -encoding binary puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -encoding shiftjis set x [list [gets $f line] $line] lappend x [tell $f] [testchannel inputbuffered $f] [eof $f] @@ -1019,32 +1045,33 @@ test io-7.3 {FilterInputBytes: split up character at EOF} { set x } [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""] test io-7.4 {FilterInputBytes: recover from split up character} {stdio} { - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -encoding binary -buffering none puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82" fconfigure $f -encoding shiftjis -blocking 0 - fileevent $f read "ready $f" - set x {} + fileevent $f read [namespace code "ready $f"] + variable x {} proc ready {f} { - lappend ::x [gets $f line] $line [fblocked $f] + variable x + lappend x [gets $f line] $line [fblocked $f] } - vwait x + vwait [namespace which -variable x] fconfigure $f -encoding binary -blocking 1 puts $f "\x51\x82\x52" fconfigure $f -encoding shiftjis - vwait x + vwait [namespace which -variable x] close $f set x } [list -1 "" 1 17 "1234567890123\uff10\uff11\uff12\uff13" 0] -test io-8.1 {PeekAhead: only go to device if no more cached data} { +test io-8.1 {PeekAhead: only go to device if no more cached data} {testchannel} { # (bufPtr->nextPtr == NULL) - set f [open "test1" w] + set f [open $path(test1) w] fconfigure $f -encoding ascii -translation lf puts -nonewline $f "123456789012345\r\n2345678" close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -encoding ascii -translation auto -buffersize 16 # here gets $f @@ -1052,29 +1079,30 @@ test io-8.1 {PeekAhead: only go to device if no more cached data} { close $f set x } "7" -test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio} { +test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio testchannel} { # not (bufPtr->nextPtr == NULL) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation lf -encoding ascii -buffering none puts -nonewline $f "123456789012345\r\nbcdefghijklmnopqrstuvwxyz" - set x {} - fileevent $f read "ready $f" + variable x {} + fileevent $f read [namespace code "ready $f"] proc ready {f} { - lappend ::x [gets $f line] $line [testchannel inputbuffered $f] + variable x + lappend x [gets $f line] $line [testchannel inputbuffered $f] } fconfigure $f -encoding unicode -buffersize 16 -blocking 0 - vwait x + vwait [namespace which -variable x] fconfigure $f -translation auto -encoding ascii -blocking 1 # here - vwait x + vwait [namespace which -variable x] close $f set x } [list -1 "" 42 15 "123456789012345" 25] -test io-8.3 {PeekAhead: no cached data available} {stdio} { +test io-8.3 {PeekAhead: no cached data available} {stdio testchannel} { # (bytesLeft == 0) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto binary} puts -nonewline $f "abcdefghijklmno\r" flush $f @@ -1088,11 +1116,11 @@ append a "1234567890123456789012345678901" test io-8.4 {PeekAhead: cached data available in this buffer} { # not (bytesLeft == 0) - set f [open test1 w+] + set f [open $path(test1) w+] fconfigure $f -translation binary puts $f "${a}\r\nabcdef" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -encoding binary -translation auto # "${a}\r" was converted in one operation (because ENCODING_LINESIZE @@ -1104,10 +1132,10 @@ test io-8.4 {PeekAhead: cached data available in this buffer} { set x } $a unset a -test io-8.5 {PeekAhead: don't peek if last read was short} {stdio} { +test io-8.5 {PeekAhead: don't peek if last read was short} {stdio testchannel} { # (bufPtr->nextAdded < bufPtr->length) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto binary} puts -nonewline $f "abcdefghijklmno\r" flush $f @@ -1116,10 +1144,10 @@ test io-8.5 {PeekAhead: don't peek if last read was short} {stdio} { close $f set x } {15 abcdefghijklmno 1} -test io-8.6 {PeekAhead: change to non-blocking mode} {stdio} { +test io-8.6 {PeekAhead: change to non-blocking mode} {stdio testchannel} { # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto binary} -buffersize 16 puts -nonewline $f "abcdefghijklmno\r" flush $f @@ -1128,10 +1156,10 @@ test io-8.6 {PeekAhead: change to non-blocking mode} {stdio} { close $f set x } {15 abcdefghijklmno 1} -test io-8.7 {PeekAhead: cleanup} {stdio} { +test io-8.7 {PeekAhead: cleanup} {stdio testchannel} { # Make sure bytes are removed from buffer. - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -translation {auto binary} -buffering none puts -nonewline $f "abcdefghijklmno\r" # here @@ -1153,11 +1181,11 @@ test io-10.2 {Tcl_ReadChars: loop until enough copied} { # one time # for (copied = 0; (unsigned) toRead > 0; ) - set f [open "test1" w] + set f [open $path(test1) w] puts $f abcdefghijklmnop close $f - set f [open "test1"] + set f [open $path(test1)] set x [read $f 5] close $f set x @@ -1166,11 +1194,11 @@ test io-10.3 {Tcl_ReadChars: loop until enough copied} { # multiple times # for (copied = 0; (unsigned) toRead > 0; ) - set f [open "test1" w] + set f [open $path(test1) w] puts $f abcdefghijklmnopqrstuvwxyz close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -buffersize 16 # here set x [read $f 19] @@ -1180,11 +1208,11 @@ test io-10.3 {Tcl_ReadChars: loop until enough copied} { test io-10.4 {Tcl_ReadChars: no more in channel buffer} { # (copiedNow < 0) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] # here set x [read $f 1000] close $f @@ -1193,11 +1221,11 @@ test io-10.4 {Tcl_ReadChars: no more in channel buffer} { test io-10.5 {Tcl_ReadChars: stop on EOF} { # (chanPtr->flags & CHANNEL_EOF) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] # here set x [read $f 1000] close $f @@ -1207,10 +1235,10 @@ test io-10.5 {Tcl_ReadChars: stop on EOF} { test io-11.1 {ReadBytes: want to read a lot} { # ((unsigned) toRead > (unsigned) srcLen) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -encoding binary # here set x [read $f 1000] @@ -1220,10 +1248,10 @@ test io-11.1 {ReadBytes: want to read a lot} { test io-11.2 {ReadBytes: want to read all} { # ((unsigned) toRead > (unsigned) srcLen) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -encoding binary # here set x [read $f] @@ -1233,10 +1261,10 @@ test io-11.2 {ReadBytes: want to read all} { test io-11.3 {ReadBytes: allocate more space} { # (toRead > length - offset - 1) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijklmnopqrstuvwxyz close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -buffersize 16 -encoding binary # here set x [read $f] @@ -1246,10 +1274,10 @@ test io-11.3 {ReadBytes: allocate more space} { test io-11.4 {ReadBytes: EOF char found} { # (TranslateInputEOL() != 0) - set f [open "test1" w] + set f [open $path(test1) w] puts $f abcdefghijklmnopqrstuvwxyz close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -eofchar m -encoding binary # here set x [list [read $f] [eof $f] [read $f] [eof $f]] @@ -1260,10 +1288,10 @@ test io-11.4 {ReadBytes: EOF char found} { test io-12.1 {ReadChars: want to read a lot} { # ((unsigned) toRead > (unsigned) srcLen) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] # here set x [read $f 1000] close $f @@ -1272,10 +1300,10 @@ test io-12.1 {ReadChars: want to read a lot} { test io-12.2 {ReadChars: want to read all} { # ((unsigned) toRead > (unsigned) srcLen) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijkl close $f - set f [open "test1"] + set f [open $path(test1)] # here set x [read $f] close $f @@ -1284,91 +1312,92 @@ test io-12.2 {ReadChars: want to read all} { test io-12.3 {ReadChars: allocate more space} { # (toRead > length - offset - 1) - set f [open "test1" w] + set f [open $path(test1) w] puts -nonewline $f abcdefghijklmnopqrstuvwxyz close $f - set f [open "test1"] + set f [open $path(test1)] fconfigure $f -buffersize 16 # here set x [read $f] close $f set x } {abcdefghijklmnopqrstuvwxyz} -test io-12.4 {ReadChars: split-up char} {stdio} { +test io-12.4 {ReadChars: split-up char} {stdio testchannel} { # (srcRead == 0) - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -encoding binary -buffering none -buffersize 16 puts -nonewline $f "123456789012345\x96" fconfigure $f -encoding shiftjis -blocking 0 - fileevent $f read "ready $f" + fileevent $f read [namespace code "ready $f"] proc ready {f} { - lappend ::x [read $f] [testchannel inputbuffered $f] + variable x + lappend x [read $f] [testchannel inputbuffered $f] } - set x {} + variable x {} fconfigure $f -encoding shiftjis - vwait x + vwait [namespace which -variable x] fconfigure $f -encoding binary -blocking 1 puts -nonewline $f "\x7b" after 500 ;# Give the cat process time to catch up fconfigure $f -encoding shiftjis -blocking 0 - vwait x + vwait [namespace which -variable x] close $f set x } [list "123456789012345" 1 "\u672c" 0] test io-12.5 {ReadChars: fileevents on partial characters} {stdio} { - makeFile { + set path(test1) [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 $::tcltest::tcltest test1]" r+] - fileevent $f readable { + } test1] + set f [open "|[list [interpreter] $path(test1)]" r+] + fileevent $f readable [namespace code { lappend x [read $f] if {[eof $f]} { lappend x eof } - } + }] puts $f "go1" flush $f fconfigure $f -blocking 0 -encoding utf-8 - set x {} - vwait x - after 500 { lappend x timeout } - vwait x + variable x {} + vwait [namespace which -variable x] + after 500 [namespace code { lappend x timeout }] + vwait [namespace which -variable x] puts $f "go2" flush $f - vwait x - after 500 { lappend x timeout } - vwait x + vwait [namespace which -variable x] + after 500 [namespace code { lappend x timeout }] + vwait [namespace which -variable x] puts $f "go3" flush $f - vwait x - vwait x + vwait [namespace which -variable x] + vwait [namespace which -variable x] lappend x [catch {close $f} msg] $msg set x } "{} timeout {} timeout \u7266 {} eof 0 {}" test io-13.1 {TranslateInputEOL: cr mode} {} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\rdef\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation cr set x [read $f] close $f set x } "abcd\ndef\n" test io-13.2 {TranslateInputEOL: crlf mode} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r\ndef\r\n" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [read $f] close $f @@ -1377,11 +1406,11 @@ test io-13.2 {TranslateInputEOL: crlf mode} { test io-13.3 {TranslateInputEOL: crlf mode: naked cr} { # (src >= srcMax) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r\ndef\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [read $f] close $f @@ -1390,11 +1419,11 @@ test io-13.3 {TranslateInputEOL: crlf mode: naked cr} { test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} { # (src >= srcMax) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r\ndef\rfgh" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [read $f] close $f @@ -1403,48 +1432,50 @@ test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} { test io-13.5 {TranslateInputEOL: crlf mode: naked lf} { # (src >= srcMax) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r\ndef\nfgh" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation crlf set x [read $f] close $f set x } "abcd\ndef\nfgh" -test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio} { +test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testchannel} { # (chanPtr->flags & INPUT_SAW_CR) # This test may fail on slower machines. - set f [open "|[list $::tcltest::tcltest cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -blocking 0 -buffering none -translation {auto lf} - fileevent $f read "ready $f" + fileevent $f read [namespace code "ready $f"] proc ready {f} { - lappend ::x [read $f] [testchannel queuedcr $f] + variable x + lappend x [read $f] [testchannel queuedcr $f] } - set x {} + variable x {} + variable y {} puts -nonewline $f "abcdefghj\r" - after 500 {set y ok} - vwait y + after 500 [namespace code {set y ok}] + vwait [namespace which -variable y] puts -nonewline $f "\n01234" - after 500 {set y ok} - vwait y + after 500 [namespace code {set y ok}] + vwait [namespace which -variable y] close $f set x } [list "abcdefghj\n" 1 "01234" 0] -test io-13.7 {TranslateInputEOL: auto mode: naked \r} { +test io-13.7 {TranslateInputEOL: auto mode: naked \r} {testchannel} { # (src >= srcMax) - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [list [read $f] [testchannel queuedcr $f]] close $f @@ -1453,22 +1484,22 @@ test io-13.7 {TranslateInputEOL: auto mode: naked \r} { test io-13.8 {TranslateInputEOL: auto mode: \r\n} { # (*src == '\n') - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\r\ndef" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [read $f] close $f set x } "abcd\ndef" test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} { - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\rdef" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [read $f] close $f @@ -1477,11 +1508,11 @@ test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} { test io-13.10 {TranslateInputEOL: auto mode: \n} { # not (*src == '\r') - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\ndef" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto set x [read $f] close $f @@ -1490,11 +1521,11 @@ test io-13.10 {TranslateInputEOL: auto mode: \n} { test io-13.11 {TranslateInputEOL: EOF char} { # (*chanPtr->inEofChar != '\0') - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "abcd\ndefgh" close $f - set f [open test1] + set f [open $path(test1)] fconfigure $f -translation auto -eofchar e set x [read $f] close $f @@ -1503,11 +1534,11 @@ test io-13.11 {TranslateInputEOL: EOF char} { test io-13.12 {TranslateInputEOL: find EOF char in src} { # (*chanPtr->inEofChar != '\0') - set f [open test1 w] + set f [open $path(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 $path(test1)] fconfigure $f -translation auto -eofchar e set x [read $f] close $f @@ -1518,12 +1549,18 @@ test io-13.12 {TranslateInputEOL: find EOF char in src} { # Tcl_SetStdChannel and Tcl_GetStdChannel. Incidentally we are # also testing channel table management. -if {$tcl_platform(platform) == "macintosh"} { - set consoleFileNames [list console0 console1 console2] +if {[info commands testchannel] != ""} { + if {$tcl_platform(platform) == "macintosh"} { + set consoleFileNames [list console0 console1 console2] + } else { + set consoleFileNames [lsort [testchannel open]] + } } else { - set consoleFileNames [lsort [testchannel open]] + # just to avoid an error + set consoleFileNames [list] } -test io-14.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} { + +test io-14.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} {testchannel} { set l "" lappend l [fconfigure stdin -buffering] lappend l [fconfigure stdout -buffering] @@ -1540,26 +1577,29 @@ test io-14.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} { interp delete x set l } {line line none} -test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {stdio} { - set f [open test1 w] - puts $f { + +set path(test3) [makeFile {} test3] + +test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} { + set f [open $path(test1) w] + puts $f [format { close stdin close stdout close stderr - set f [open test1 r] - set f2 [open test2 w] - set f3 [open test3 w] + set f [open "%s" r] + set f2 [open "%s" w] + set f3 [open "%s" w] puts stdout [gets stdin] puts stdout out puts stderr err close $f close $f2 close $f3 - } + } $path(test1) $path(test2) $path(test3)] close $f - set result [exec $::tcltest::tcltest test1] - set f [open test2 r] - set f2 [open test3 r] + set result [exec [interpreter] $path(test1)] + set f [open $path(test2) r] + set f2 [open $path(test3) r] lappend result [read $f] [read $f2] close $f close $f2 @@ -1569,25 +1609,25 @@ out } {err }} # This test relies on the fact that the smallest available fd is used first. -test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {unixOnly} { - set f [open test1 w] - puts $f { close stdin +test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unixOnly} { + set f [open $path(test1) w] + puts $f [format { close stdin close stdout close stderr - set f [open test1 r] - set f2 [open test2 w] - set f3 [open test3 w] + set f [open "%s" r] + set f2 [open "%s" w] + set f3 [open "%s" w] puts stdout [gets stdin] puts stdout $f2 puts stderr $f3 close $f close $f2 close $f3 - } + } $path(test1) $path(test2) $path(test3)] close $f - set result [exec $::tcltest::tcltest test1] - set f [open test2 r] - set f2 [open test3 r] + set result [exec [interpreter] $path(test1)] + set f [open $path(test2) r] + set f2 [open $path(test3) r] lappend result [read $f] [read $f2] close $f close $f2 @@ -1627,38 +1667,43 @@ test io-14.7 {Tcl_GetChannel: stdio name translation} { interp delete z set result } {{} {} {can not find channel named "stderr"}} + +set path(script) [makeFile {} script] + test io-14.8 {reuse of stdio special channels} {stdio} { removeFile script removeFile test1 - set f [open script w] - puts $f { + set f [open $path(script) w] + puts $f [format { close stderr - set f [open test1 w] + set f [open "%s" w] puts stderr hello close $f - set f [open test1 r] + set f [open "%s" r] puts [gets $f] - } + } $path(test1) $path(test1)] close $f - set f [open "|[list $::tcltest::tcltest script]" r] + set f [open "|[list [interpreter] $path(script)]" r] set c [gets $f] close $f set c } hello + test io-14.9 {reuse of stdio special channels} {stdio} { removeFile script removeFile test1 - set f [open script w] + set f [open $path(script) w] puts $f { - set f [open test1 w] + array set path [lindex $argv 0] + set f [open $path(test1) w] puts $f hello close $f close stderr - set f [open "|[list [info nameofexecutable] cat test1]" r] + set f [open "|[list [info nameofexecutable] $path(cat) $path(test1)]" r] puts [gets $f] } close $f - set f [open "|[list $::tcltest::tcltest script]" r] + set f [open "|[list [interpreter] $path(script) [array get path]]" r] set c [gets $f] close $f set c @@ -1677,7 +1722,7 @@ test io-16.1 {Tcl_DeleteCloseHandler} { # These functions use "eof stdin" to ensure that the standard # channels are added to the channel table of the interpreter. -test io-17.1 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.1 {GetChannelTable, DeleteChannelTable on std handles} {testchannel} { set l1 [testchannel refcount stdin] eof stdin interp create x @@ -1689,7 +1734,7 @@ test io-17.1 {GetChannelTable, DeleteChannelTable on std handles} { lappend l [expr [testchannel refcount stdin] - $l1] set l } {0 1 0} -test io-17.2 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.2 {GetChannelTable, DeleteChannelTable on std handles} {testchannel} { set l1 [testchannel refcount stdout] eof stdin interp create x @@ -1701,7 +1746,7 @@ test io-17.2 {GetChannelTable, DeleteChannelTable on std handles} { lappend l [expr [testchannel refcount stdout] - $l1] set l } {0 1 0} -test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} {testchannel} { set l1 [testchannel refcount stderr] eof stdin interp create x @@ -1714,10 +1759,10 @@ test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} { set l } {0 1 0} -test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { +test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { removeFile test1 set l "" - set f [open test1 w] + set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] close $f if {[catch {lindex [testchannel info $f] 15} msg]} { @@ -1728,10 +1773,10 @@ test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { string compare [string tolower $l] \ [list 1 [format "can not find channel named \"%s\"" $f]] } 0 -test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { +test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { removeFile test1 set l "" - set f [open test1 w] + set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] interp create x interp share "" $f x @@ -1749,10 +1794,10 @@ test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { 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} { +test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { removeFile test1 set l "" - set f [open test1 w] + set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] interp create x interp share "" $f x @@ -1774,7 +1819,7 @@ test io-19.1 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} { } 0 test io-19.2 {testing Tcl_GetChannel, user opened handle} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] set x [eof $f] close $f set x @@ -1782,9 +1827,9 @@ test io-19.2 {testing Tcl_GetChannel, user opened handle} { 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} { +test io-19.4 {Tcl_CreateChannel, insertion into channel table} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] set l "" lappend l [eof $f] close $f @@ -1798,10 +1843,10 @@ test io-19.4 {Tcl_CreateChannel, insertion into channel table} { } 0 test io-20.1 {Tcl_CreateChannel: initial settings} { - set a [open test2 w] + set a [open $path(test2) w] set old [encoding system] encoding system ascii - set f [open test1 w] + set f [open $path(test1) w] set x [fconfigure $f -encoding] close $f encoding system $old @@ -1809,33 +1854,36 @@ test io-20.1 {Tcl_CreateChannel: initial settings} { set x } {ascii} test io-20.2 {Tcl_CreateChannel: initial settings} {pcOnly} { - set f [open test1 w+] + set f [open $path(test1) w+] set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] close $f set x } [list [list \x1a ""] {auto crlf}] test io-20.3 {Tcl_CreateChannel: initial settings} {unixOnly} { - set f [open test1 w+] + set f [open $path(test1) w+] set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] close $f set x } {{{} {}} {auto lf}} test io-20.4 {Tcl_CreateChannel: initial settings} {macOnly} { - set f [open test1 w+] + set f [open $path(test1) w+] set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] close $f set x } {{{} {}} {auto cr}} + +set path(stdout) [makeFile {} stdout] + test io-20.5 {Tcl_CreateChannel: install channel in empty slot} {stdio} { - set f [open script w] - puts $f { + set f [open $path(script) w] + puts $f [format { close stdout - set f1 [open stdout w] + set f1 [open "%s" w] fconfigure $f1 -buffersize 777 puts stderr [fconfigure stdout -buffersize] - } + } $path(stdout)] close $f - set f [open "|[list $::tcltest::tcltest script]"] + set f [open "|[list [interpreter] $path(script)]"] catch {close $f} msg set msg } {777} @@ -1853,28 +1901,28 @@ test io-22.1 {Tcl_GetChannelMode} { # Not used anywhere in Tcl. } {} -test io-23.1 {Tcl_GetChannelName} { +test io-23.1 {Tcl_GetChannelName} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] set n [testchannel name $f] close $f string compare $n $f } 0 -test io-24.1 {Tcl_GetChannelType} { +test io-24.1 {Tcl_GetChannelType} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] set t [testchannel type $f] close $f string compare $t file } 0 -test io-25.1 {Tcl_GetChannelHandle, input} { - set f [open test1 w] +test io-25.1 {Tcl_GetChannelHandle, input} {testchannel} { + set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} puts $f "1234567890\n098765432" close $f - set f [open test1 r] + set f [open $path(test1) r] gets $f set l "" lappend l [testchannel inputbuffered $f] @@ -1882,9 +1930,9 @@ test io-25.1 {Tcl_GetChannelHandle, input} { close $f set l } {10 11} -test io-25.2 {Tcl_GetChannelHandle, output} { +test io-25.2 {Tcl_GetChannelHandle, output} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello set l "" @@ -1902,7 +1950,7 @@ test io-26.1 {Tcl_GetChannelInstanceData} {stdio} { # "pid" command uses Tcl_GetChannelInstanceData # Don't care what pid is (but must be a number), just want to exercise it. - set f [open "|[list $::tcltest::tcltest << exit]"] + set f [open "|[list [interpreter] << exit]"] expr [pid $f] close $f } {} @@ -1911,100 +1959,104 @@ test io-26.1 {Tcl_GetChannelInstanceData} {stdio} { test io-27.1 {FlushChannel, no output buffered} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] flush $f - set s [file size test1] + set s [file size $path(test1)] close $f set s } 0 test io-27.2 {FlushChannel, some output buffered} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set l "" puts $f hello - lappend l [file size test1] + lappend l [file size $path(test1)] flush $f - lappend l [file size test1] + lappend l [file size $path(test1)] close $f - lappend l [file size test1] + lappend l [file size $path(test1)] set l } {0 6 6} test io-27.3 {FlushChannel, implicit flush on close} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set l "" puts $f hello - lappend l [file size test1] + lappend l [file size $path(test1)] close $f - lappend l [file size test1] + lappend l [file size $path(test1)] set l } {0 6} test io-27.4 {FlushChannel, implicit flush when buffer fills} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} fconfigure $f -buffersize 60 set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] for {set i 0} {$i < 12} {incr i} { puts $f hello } - lappend l [file size test1] + lappend l [file size $path(test1)] flush $f - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {0 60 72} test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \ {unixOrPc} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf -buffersize 60 -eofchar {} set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] for {set i 0} {$i < 12} {incr i} { puts $f hello } - lappend l [file size test1] + lappend l [file size $path(test1)] close $f - lappend l [file size test1] + lappend l [file size $path(test1)] set l } {0 60 72} + +set path(pipe) [makeFile {} pipe] +set path(output) [makeFile {} output] + test io-27.6 {FlushChannel, async flushing, async close} \ {stdio asyncPipeClose } { removeFile pipe removeFile output - set f [open pipe w] - puts $f { - set f [open output w] + set f [open $path(pipe) w] + puts $f [format { + set f [open "%s" w] fconfigure $f -translation lf -buffering none -eofchar {} while {![eof stdin]} { after 20 puts -nonewline $f [read stdin 1024] } close $f - } + } $path(output)] 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 $path(output) w] close $f - set f [open "|[list $::tcltest::tcltest pipe]" w] + set f [open "|[list [interpreter] $path(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 $path(output)] < 65536) && ($counter < 1000)} { incr counter after 20 update } if {$counter == 1000} { - set result "file size only [file size output]" + set result "file size only [file size $path(output)]" } else { set result ok } @@ -2012,9 +2064,9 @@ test io-27.6 {FlushChannel, async flushing, async close} \ # Tests closing a channel. The functions tested are CloseChannel and Tcl_Close. -test io-28.1 {CloseChannel called when all references are dropped} { +test io-28.1 {CloseChannel called when all references are dropped} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] interp create x interp share "" $f x set l "" @@ -2027,7 +2079,7 @@ test io-28.1 {CloseChannel called when all references are dropped} { } {2 1} test io-28.2 {CloseChannel called when all references are dropped} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] interp create x interp share "" $f x puts -nonewline $f abc @@ -2035,7 +2087,7 @@ 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 $path(test1) r] set l [gets $f] close $f set l @@ -2044,7 +2096,7 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ {stdio asyncPipeClose nonPortable} { removeFile pipe removeFile output - set f [open pipe w] + set f [open $path(pipe) w] puts $f { # Need to not have eof char appended on close, because the other @@ -2054,7 +2106,7 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ fconfigure stdout -eofchar {} fconfigure stderr -eofchar {} - set f [open output w] + set f [open $path(output) w] fconfigure $f -translation lf -buffering none for {set x 0} {$x < 20} {incr x} { after 20 @@ -2067,15 +2119,15 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ for {set i 0} {$i < 11} {incr i} { set x "$x$x" } - set f [open output w] + set f [open $path(output) w] close $f - set f [open "|[list $::tcltest::tcltest 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 $path(output)] < 20480) && ($counter < 1000)} { incr counter after 20 update @@ -2086,11 +2138,11 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ set result ok } } ok -test io-28.4 {Tcl_Close} { +test io-28.4 {Tcl_Close} {testchannel} { removeFile test1 set l "" lappend l [lsort [testchannel open]] - set f [open test1 w] + set f [open $path(test1) w] lappend l [lsort [testchannel open]] close $f lappend l [lsort [testchannel open]] @@ -2099,15 +2151,15 @@ test io-28.4 {Tcl_Close} { $consoleFileNames] string compare $l $x } 0 -test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly} { +test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly testchannel} { removeFile script - set f [open script w] + set f [open $path(script) w] puts $f { close stdin puts [testchannel open] } close $f - set f [open "|[list $::tcltest::tcltest script]" r] + set f [open "|[list [interpreter] $path(script)]" r] set l [gets $f] close $f set l @@ -2118,97 +2170,97 @@ test io-29.1 {Tcl_WriteChars, channel not writable} { } {1 {channel "stdin" wasn't opened for writing}} test io-29.2 {Tcl_WriteChars, empty string} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -eofchar {} puts -nonewline $f "" close $f - file size test1 + file size $path(test1) } 0 test io-29.3 {Tcl_WriteChars, nonempty string} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -eofchar {} puts -nonewline $f hello close $f - file size test1 + file size $path(test1) } 5 -test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} { +test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] flush $f lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {6 0 0 6} -test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} { +test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] puts $f hello lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {5 0 0 11} -test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} { +test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] puts $f hello lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {0 5 0 11} -test io-29.7 {Tcl_Flush, full buffering} { +test io-29.7 {Tcl_Flush, full buffering} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] puts $f hello lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] flush $f lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {5 0 11 0 0 11} -test io-29.8 {Tcl_Flush, full buffering} { +test io-29.8 {Tcl_Flush, full buffering} {testchannel} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] flush $f lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] puts $f hello lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] flush $f lappend l [testchannel outputbuffered $f] - lappend l [file size test1] + lappend l [file size $path(test1)] close $f set l } {5 0 0 5 0 11 0 11} @@ -2217,41 +2269,41 @@ test io-29.9 {Tcl_Flush, channel not writable} { } {1 {channel "stdin" wasn't opened for writing}} test io-29.10 {Tcl_WriteChars, looping and buffering} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} - set f2 [open longfile r] + set f2 [open $path(longfile) r] for {set x 0} {$x < 10} {incr x} { puts $f1 [gets $f2] } close $f2 close $f1 - file size test1 + file size $path(test1) } 387 test io-29.11 {Tcl_WriteChars, no newline, implicit flush} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -eofchar {} - set f2 [open longfile r] + set f2 [open $path(longfile) r] for {set x 0} {$x < 10} {incr x} { puts -nonewline $f1 [gets $f2] } close $f1 close $f2 - file size test1 + file size $path(test1) } 377 test io-29.12 {Tcl_WriteChars on a pipe} {stdio} { removeFile test1 removeFile pipe - set f1 [open pipe w] - puts $f1 { - set f1 [open longfile r] + set f1 [open $path(pipe) w] + puts $f1 [format { + set f1 [open "%s" r] for {set x 0} {$x < 10} {incr x} { puts [gets $f1] } - } + } $path(longfile)] close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r] - set f2 [open longfile r] + set f1 [open "|[list [interpreter] $path(pipe)]" r] + set f2 [open $path(longfile) r] set y ok for {set x 0} {$x < 10} {incr x} { set l1 [gets $f1] @@ -2267,16 +2319,16 @@ test io-29.12 {Tcl_WriteChars on a pipe} {stdio} { test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} { removeFile test1 removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 { puts [gets stdin] puts [gets stdin] } close $f1 set y ok - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] fconfigure $f1 -buffering line - set f2 [open longfile r] + set f2 [open $path(longfile) r] set line [gets $f2] puts $f1 $line set backline [gets $f1] @@ -2295,28 +2347,28 @@ test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} { } ok test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} { removeFile test3 - set f [open test3 w] + set f [open $path(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 $path(test3) r] set x [gets $f] close $f set x } {Text1 Text 2 Text 3} test io-29.15 {Tcl_Flush, channel not open for writing} { removeFile test1 - set fd [open test1 w] + set fd [open $path(test1) w] close $fd - set fd [open test1 r] + set fd [open $path(test1) r] set x [list [catch {flush $fd} msg] $msg] close $fd 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 $::tcltest::tcltest 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 \ @@ -2324,79 +2376,79 @@ test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio} { } 0 test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(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 $path(test1)] close $f1 set x } 18 test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} { removeFile test1 set x "" - set f1 [open test1 w] + set f1 [open $path(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 $path(test1)] puts $f1 hello flush $f1 - lappend x [file size test1] + lappend x [file size $path(test1)] puts $f1 hello flush $f1 - lappend x [file size test1] + lappend x [file size $path(test1)] close $f1 set x } {18 24 30} test io-29.19 {Explicit and implicit flushes} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(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 $path(test1)] puts $f1 hello flush $f1 - lappend x [file size test1] + lappend x [file size $path(test1)] puts $f1 hello close $f1 - lappend x [file size test1] + lappend x [file size $path(test1)] set x } {18 24 30} test io-29.20 {Implicit flush when buffer is full} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(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 $path(test1)] for {set x 0} {$x < 100} {incr x} { puts $f1 $line } - lappend z [file size test1] + lappend z [file size $path(test1)] close $f1 - lappend z [file size test1] + lappend z [file size $path(test1)] set z } {4096 12288 12600} test io-29.21 {Tcl_Flush to pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(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 $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello flush $f1 set x [gets $f1] @@ -2405,7 +2457,7 @@ test io-29.21 {Tcl_Flush to pipe} {stdio} { } "read 6 characters" test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 { fconfigure stdout -buffering full puts hello @@ -2416,7 +2468,7 @@ test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { flush stdout } close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] set x "" lappend x [gets $f1] lappend x [gets $f1] @@ -2428,7 +2480,7 @@ test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { } {hello hello bye} test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 { puts hello puts hello @@ -2436,7 +2488,7 @@ test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { puts bye } close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] set x "" lappend x [gets $f1] lappend x [gets $f1] @@ -2447,15 +2499,15 @@ test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { set x } {hello hello bye} test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} { - set f [open test3 w] + set f [open $path(test3) w] puts $f "Line 1" puts $f "Line 2" - set f2 [open test3] + set f2 [open $path(test3)] set x {} lappend x [read -nonewline $f2] close $f2 flush $f - set f2 [open test3] + set f2 [open $path(test3)] lappend x [read -nonewline $f2] close $f2 close $f @@ -2463,12 +2515,12 @@ test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} { } "{} {Line 1\nLine 2}" test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { removeFile test3 - set f [open "|[list $::tcltest::tcltest cat | $::tcltest::tcltest cat > test3]" w] + set f [open "|[list [interpreter] $path(cat) | [interpreter] $path(cat) > $path(test3)]" w] puts $f "Line 1" puts $f "Line 2" close $f after 100 - set f [open test3 r] + set f [open $path(test3) r] set x [read $f] close $f set x @@ -2483,10 +2535,10 @@ test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs } {Line1} test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { removeFile pipe - set f [open pipe w] + set f [open $path(pipe) w] puts $f {exit} close $f - set f [open "|[list $::tcltest::tcltest pipe]" r+] + set f [open "|[list [interpreter] $path(pipe)]" r+] gets $f puts $f output after 50 @@ -2511,35 +2563,35 @@ test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { } {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}} test io-29.28 {Tcl_WriteChars, lf mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} puts $f hello\nthere\nand\nhere flush $f - set s [file size test1] + set s [file size $path(test1)] close $f set s } 21 test io-29.29 {Tcl_WriteChars, cr mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} puts $f hello\nthere\nand\nhere close $f - file size test1 + file size $path(test1) } 21 test io-29.30 {Tcl_WriteChars, crlf mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} puts $f hello\nthere\nand\nhere close $f - file size test1 + file size $path(test1) } 25 test io-29.31 {Tcl_WriteChars, background flush} {stdio} { removeFile pipe removeFile output - set f [open pipe w] - puts $f {set f [open output w]} + set f [open $path(pipe) w] + puts $f [format {set f [open "%s" w]} $path(output)] puts $f {fconfigure $f -translation lf} set x [list while {![eof stdin]}] set x "$x {" @@ -2553,20 +2605,20 @@ test io-29.31 {Tcl_WriteChars, background flush} {stdio} { for {set i 0} {$i < 11} {incr i} { set x "$x$x" } - set f [open output w] + set f [open $path(output) w] close $f - set f [open "|[list $::tcltest::tcltest pipe]" r+] + set f [open "|[list [interpreter] $path(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 $path(output)] < 65536) && ($counter < 1000)} { incr counter after 5 update } if {$counter == 1000} { - set result "file size only [file size output]" + set result "file size only [file size $path(output)]" } else { set result ok } @@ -2575,8 +2627,8 @@ test io-29.32 {Tcl_WriteChars, background flush to slow reader} \ {stdio asyncPipeClose} { removeFile pipe removeFile output - set f [open pipe w] - puts $f {set f [open output w]} + set f [open $path(pipe) w] + puts $f [format {set f [open "%s" w]} $path(output)] puts $f {fconfigure $f -translation lf} set x [list while {![eof stdin]}] set x "$x {" @@ -2591,43 +2643,43 @@ test io-29.32 {Tcl_WriteChars, background flush to slow reader} \ for {set i 0} {$i < 11} {incr i} { set x "$x$x" } - set f [open output w] + set f [open $path(output) w] close $f - set f [open "|[list $::tcltest::tcltest pipe]" r+] + set f [open "|[list [interpreter] $path(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 $path(output)] < 65536) && ($counter < 1000)} { incr counter after 20 update } if {$counter == 1000} { - set result "file size only [file size output]" + set result "file size only [file size $path(output)]" } else { set result ok } } ok -test io-29.33 {Tcl_Flush, implicit flush on exit} {stdio} { - set f [open script w] - puts $f { - set f [open test1 w] +test io-29.33 {Tcl_Flush, implicit flush on exit} {exec} { + set f [open $path(script) w] + puts $f [format { + set f [open "%s" w] fconfigure $f -translation lf puts $f hello puts $f bye puts $f strange - } + } $path(test1)] close $f - exec $::tcltest::tcltest script - set f [open test1 r] + exec [interpreter] $path(script) + set f [open $path(test1) r] set r [read $f] close $f set r } "hello\nbye\nstrange\n" test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac} { set c 0 - set x running + variable x running set l abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz proc writelots {s l} { for {set i 0} {$i < 2000} {incr i} { @@ -2635,13 +2687,14 @@ test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMa } } proc accept {s a p} { - global x - fileevent $s readable [list readit $s] + variable x + fileevent $s readable [namespace code [list readit $s]] fconfigure $s -blocking off set x accepted } proc readit {s} { - global c x + variable c + variable x set l [gets $s] if {[eof $s]} { @@ -2651,14 +2704,14 @@ test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMa incr c } } - set ss [socket -server accept 2828] - set cs [socket [info hostname] 2828] - vwait x + set ss [socket -server [namespace code accept] 0] + set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + vwait [namespace which -variable x] fconfigure $cs -blocking off writelots $cs $l close $cs close $ss - vwait x + vwait [namespace which -variable x] set c } 2000 test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotMac} { @@ -2669,12 +2722,12 @@ test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotM catch {interp delete y} interp create x interp create y - set s [socket -server accept 2828] + set s [socket -server [namespace code accept] 0] proc accept {s a p} { puts $s hello close $s } - set c [socket [info hostname] 2828] + set c [socket [info hostname] [lindex [fconfigure $s -sockname] 2]] interp share {} $c x interp share {} $c y close $c @@ -2707,11 +2760,11 @@ test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotM test io-30.1 {Tcl_Write lf, Tcl_Read lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set x [read $f] close $f @@ -2719,11 +2772,11 @@ test io-30.1 {Tcl_Write lf, Tcl_Read lf} { } "hello\nthere\nand\nhere\n" test io-30.2 {Tcl_Write lf, Tcl_Read cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set x [read $f] close $f @@ -2731,11 +2784,11 @@ test io-30.2 {Tcl_Write lf, Tcl_Read cr} { } "hello\nthere\nand\nhere\n" test io-30.3 {Tcl_Write lf, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set x [read $f] close $f @@ -2743,11 +2796,11 @@ test io-30.3 {Tcl_Write lf, Tcl_Read crlf} { } "hello\nthere\nand\nhere\n" test io-30.4 {Tcl_Write cr, Tcl_Read cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set x [read $f] close $f @@ -2755,11 +2808,11 @@ test io-30.4 {Tcl_Write cr, Tcl_Read cr} { } "hello\nthere\nand\nhere\n" test io-30.5 {Tcl_Write cr, Tcl_Read lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set x [read $f] close $f @@ -2767,11 +2820,11 @@ test io-30.5 {Tcl_Write cr, Tcl_Read lf} { } "hello\rthere\rand\rhere\r" test io-30.6 {Tcl_Write cr, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set x [read $f] close $f @@ -2779,11 +2832,11 @@ test io-30.6 {Tcl_Write cr, Tcl_Read crlf} { } "hello\rthere\rand\rhere\r" test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set x [read $f] close $f @@ -2791,11 +2844,11 @@ test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} { } "hello\nthere\nand\nhere\n" test io-30.8 {Tcl_Write crlf, Tcl_Read lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set x [read $f] close $f @@ -2803,11 +2856,11 @@ test io-30.8 {Tcl_Write crlf, Tcl_Read lf} { } "hello\r\nthere\r\nand\r\nhere\r\n" test io-30.9 {Tcl_Write crlf, Tcl_Read cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set x [read $f] close $f @@ -2815,11 +2868,11 @@ test io-30.9 {Tcl_Write crlf, Tcl_Read cr} { } "hello\n\nthere\n\nand\n\nhere\n\n" test io-30.10 {Tcl_Write lf, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set c [read $f] set x [fconfigure $f -translation] close $f @@ -2831,11 +2884,11 @@ here } auto} test io-30.11 {Tcl_Write cr, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set c [read $f] set x [fconfigure $f -translation] close $f @@ -2847,11 +2900,11 @@ here } auto} test io-30.12 {Tcl_Write crlf, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set c [read $f] set x [fconfigure $f -translation] close $f @@ -2864,7 +2917,7 @@ here test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf puts -nonewline $f x ;# shift crlf across block boundary @@ -2872,7 +2925,7 @@ 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 $path(test1) r] fconfigure $f -translation auto set c [read $f] close $f @@ -2881,7 +2934,7 @@ test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf puts -nonewline $f x ;# shift crlf across block boundary @@ -2889,7 +2942,7 @@ 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 $path(test1) r] fconfigure $f -translation crlf set c [read $f] close $f @@ -2898,11 +2951,11 @@ test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { test io-30.15 {Tcl_Write mixed, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\rhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation auto set c [read $f] close $f @@ -2914,11 +2967,11 @@ here } test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set c [read $f] close $f @@ -2930,11 +2983,11 @@ here } test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -eofchar \x1a -translation lf puts $f hello\nthere\nand\rhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set c [read $f] close $f @@ -2946,12 +2999,12 @@ here } test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set l "" lappend l [gets $f] @@ -2966,12 +3019,12 @@ test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { } {abc def 0 {} 1 {} 1} test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set l "" lappend l [gets $f] @@ -2986,12 +3039,12 @@ test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { } {abc def 0 {} 1 {} 1} test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation lf -eofchar {} set l "" lappend l [gets $f] @@ -3008,12 +3061,12 @@ test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { } "abc def 0 \x1aghi 0 qrs 0 {} 1" test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation cr -eofchar {} set l "" set x [gets $f] @@ -3026,12 +3079,12 @@ test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { } {0 1 {} 1} test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation crlf -eofchar {} set l "" set x [gets $f] @@ -3044,12 +3097,12 @@ test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { } {0 1 {} 1} test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3058,12 +3111,12 @@ test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { } {8 1} test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation lf -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3072,12 +3125,12 @@ test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { } {8 1} test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3086,12 +3139,12 @@ test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { } {8 1} test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation cr -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3100,12 +3153,12 @@ test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { } {8 1} test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3114,12 +3167,12 @@ test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { } {8 1} test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation crlf -eofchar \x1a set c [string length [read $f]] set e [eof $f] @@ -3131,11 +3184,11 @@ test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { test io-31.1 {Tcl_Write lf, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" lappend l [gets $f] lappend l [tell $f] @@ -3148,11 +3201,11 @@ test io-31.1 {Tcl_Write lf, Tcl_Gets auto} { } {hello 6 auto there 12 auto} test io-31.2 {Tcl_Write cr, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" lappend l [gets $f] lappend l [tell $f] @@ -3165,11 +3218,11 @@ test io-31.2 {Tcl_Write cr, Tcl_Gets auto} { } {hello 6 auto there 12 auto} test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" lappend l [gets $f] lappend l [tell $f] @@ -3182,11 +3235,11 @@ test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} { } {hello 7 auto there 14 auto} test io-31.4 {Tcl_Write lf, Tcl_Gets lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set l "" lappend l [gets $f] @@ -3200,11 +3253,11 @@ test io-31.4 {Tcl_Write lf, Tcl_Gets lf} { } {hello 6 lf there 12 lf} test io-31.5 {Tcl_Write lf, Tcl_Gets cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set l "" lappend l [string length [gets $f]] @@ -3220,11 +3273,11 @@ test io-31.5 {Tcl_Write lf, Tcl_Gets cr} { } {21 21 cr 1 {} 21 cr 1} test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set l "" lappend l [string length [gets $f]] @@ -3240,11 +3293,11 @@ test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} { } {21 21 crlf 1 {} 21 crlf 1} test io-31.7 {Tcl_Write cr, Tcl_Gets cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set l "" lappend l [gets $f] @@ -3260,11 +3313,11 @@ test io-31.7 {Tcl_Write cr, Tcl_Gets cr} { } {hello 6 cr 0 there 12 cr 0} test io-31.8 {Tcl_Write cr, Tcl_Gets lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set l "" lappend l [string length [gets $f]] @@ -3280,11 +3333,11 @@ test io-31.8 {Tcl_Write cr, Tcl_Gets lf} { } {21 21 lf 1 {} 21 lf 1} test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set l "" lappend l [string length [gets $f]] @@ -3300,11 +3353,11 @@ test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} { } {21 21 crlf 1 {} 21 crlf 1} test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation crlf set l "" lappend l [gets $f] @@ -3320,11 +3373,11 @@ test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} { } {hello 7 crlf 0 there 14 crlf 0} test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation cr set l "" lappend l [gets $f] @@ -3340,11 +3393,11 @@ test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} { } {hello 6 cr 0 6 13 cr 0} test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation lf set l "" lappend l [string length [gets $f]] @@ -3360,7 +3413,7 @@ test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} { } {6 7 lf 0 6 14 lf 0} test io-31.13 {binary mode is synonym of lf mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation binary set x [fconfigure $f -translation] close $f @@ -3372,11 +3425,11 @@ test io-31.13 {binary mode is synonym of lf mode} { # test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\rand\r\nhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -translation auto set l "" lappend l [gets $f] @@ -3391,11 +3444,11 @@ test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto set l "" lappend l [gets $f] @@ -3410,11 +3463,11 @@ test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] set l "" lappend l [gets $f] lappend l [gets $f] @@ -3428,11 +3481,11 @@ test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto set l "" lappend l [gets $f] @@ -3447,12 +3500,12 @@ test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set l "" lappend l [gets $f] @@ -3467,11 +3520,11 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -eofchar \x1a -translation lf puts $f hello\nthere\nand\rhere close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set l "" lappend l [gets $f] @@ -3486,12 +3539,12 @@ test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { } {hello there and here 0 {} 1} test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a fconfigure $f -translation auto set l "" @@ -3505,12 +3558,12 @@ test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { } {abc def 0 {} 1} test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto set l "" lappend l [gets $f] @@ -3523,12 +3576,12 @@ test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { } {abc def 0 {} 1} test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation lf -eofchar {} set l "" lappend l [gets $f] @@ -3545,12 +3598,12 @@ test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation cr -eofchar {} set l "" lappend l [gets $f] @@ -3567,12 +3620,12 @@ test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation crlf -eofchar {} set l "" lappend l [gets $f] @@ -3589,12 +3642,12 @@ test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l "" lappend l [gets $f] @@ -3607,12 +3660,12 @@ test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { } {abc def 0 {} 1} test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation lf -eofchar \x1a set l "" lappend l [gets $f] @@ -3625,12 +3678,12 @@ test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { } {abc def 0 {} 1} test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l "" lappend l [gets $f] @@ -3643,12 +3696,12 @@ test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { } {abc def 0 {} 1} test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation cr -eofchar \x1a set l "" lappend l [gets $f] @@ -3661,12 +3714,12 @@ test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { } {abc def 0 {} 1} test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l "" lappend l [gets $f] @@ -3679,12 +3732,12 @@ test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { } {abc def 0 {} 1} test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1) r] fconfigure $f -translation crlf -eofchar \x1a set l "" lappend l [gets $f] @@ -3697,7 +3750,7 @@ test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { } {abc def 0 {} 1} test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf puts -nonewline $f x ;# shift crlf across block boundary @@ -3705,7 +3758,7 @@ 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 $path(test1) r] fconfigure $f -translation crlf set c "" while {[gets $f line] >= 0} { @@ -3716,7 +3769,7 @@ test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} { } [expr 700*15+1] test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf puts -nonewline $f x ;# shift crlf across block boundary @@ -3724,7 +3777,7 @@ 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 $path(test1) r] fconfigure $f -translation auto set c "" while {[gets $f line] >= 0} { @@ -3744,13 +3797,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 $path(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 $path(longfile) r] set x [read $f 1024] set s [string length $x] unset x @@ -3758,7 +3811,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 $path(longfile) r] fconfigure $f -buffersize 100 set x [read $f 1024] set s [string length $x] @@ -3767,19 +3820,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 $path(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 $path(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 $path(longfile) r] fconfigure $f1 -blocking off set z [read $f1 20] close $f1 @@ -3791,25 +3844,25 @@ 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 $path(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 l [string length $z] + set z [file size $path(longfile)] if {$z != $l} { set x broken } - set x + set x } ok test io-32.9 {Tcl_Read, read to end of file} { - set f1 [open longfile r] + set f1 [open $path(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 $path(longfile)] if {$z != $l} { set x broken } @@ -3817,10 +3870,10 @@ test io-32.9 {Tcl_Read, read to end of file} { } ok test io-32.10 {Tcl_Read from a pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello flush $f1 set x [read $f1] @@ -3829,11 +3882,11 @@ test io-32.10 {Tcl_Read from a pipe} {stdio} { } "hello\n" test io-32.11 {Tcl_Read from a pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} puts $f1 {puts [gets stdin]} close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello flush $f1 set x "" @@ -3848,11 +3901,11 @@ test io-32.11 {Tcl_Read from a pipe} {stdio} { }} test io-32.12 {Tcl_Read, -nonewline} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] puts $f1 hello puts $f1 bye close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] set c [read -nonewline $f1] close $f1 set c @@ -3860,11 +3913,11 @@ test io-32.12 {Tcl_Read, -nonewline} { bye} test io-32.13 {Tcl_Read, -nonewline} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] puts $f1 hello puts $f1 bye close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] set c [read -nonewline $f1] close $f1 list [string length $c] $c @@ -3872,11 +3925,11 @@ test io-32.13 {Tcl_Read, -nonewline} { bye}} test io-32.14 {Tcl_Read, reading in small chunks} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" close $f - set f [open test1] + set f [open $path(test1)] set x [list [read $f 1] [read $f 2] [read $f]] close $f set x @@ -3885,11 +3938,11 @@ and this one }} test io-32.15 {Tcl_Read, asking for more input than available} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" close $f - set f [open test1] + set f [open $path(test1)] set x [read $f 100] close $f set x @@ -3898,11 +3951,11 @@ and this one } test io-32.16 {Tcl_Read, read to end of file with -nonewline} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" close $f - set f [open test1] + set f [open $path(test1)] set x [read -nonewline $f] close $f set x @@ -3913,11 +3966,11 @@ and this one} test io-33.1 {Tcl_Gets, reading what was written} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set y "first line" puts $f1 $y close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] set x [gets $f1] set z ok if {"$x" != "$y"} { @@ -3927,7 +3980,7 @@ test io-33.1 {Tcl_Gets, reading what was written} { set z } ok test io-33.2 {Tcl_Gets into variable} { - set f1 [open longfile r] + set f1 [open $path(longfile) r] set c [gets $f1 x] set l [string length x] set z ok @@ -3939,10 +3992,10 @@ test io-33.2 {Tcl_Gets into variable} { } ok test io-33.3 {Tcl_Gets from pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello flush $f1 set x [gets $f1] @@ -3955,30 +4008,30 @@ test io-33.3 {Tcl_Gets from pipe} {stdio} { } ok test io-33.4 {Tcl_Gets with long line} { removeFile test3 - set f [open test3 w] + set f [open $path(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 $path(test3)] set x [gets $f] close $f set x } {abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} test io-33.5 {Tcl_Gets with long line} { - set f [open test3] + set f [open $path(test3)] set x [gets $f y] close $f list $x $y } {260 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} test io-33.6 {Tcl_Gets and end of file} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] puts -nonewline $f "Test1\nTest2" close $f - set f [open test3] + set f [open $path(test3)] set x {} set y {} lappend x [gets $f y] $y @@ -3990,51 +4043,51 @@ test io-33.6 {Tcl_Gets and end of file} { set x } {5 Test1 5 Test2 -1 {}} test io-33.7 {Tcl_Gets and bad variable} { - set f [open test3 w] + set f [open $path(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 $path(test3) r] set result [list [catch {gets $f x(0)} msg] $msg] close $f set result } {1 {can't set "x(0)": variable isn't array}} test io-33.8 {Tcl_Gets, exercising double buffering} { - set f [open test3 w] + set f [open $path(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 $path(test3) r] fconfigure $f -translation lf for {set y 0} {$y < 100} {incr y} {gets $f} close $f set y } 100 test io-33.9 {Tcl_Gets, exercising double buffering} { - set f [open test3 w] + set f [open $path(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 $path(test3) r] fconfigure $f -translation lf for {set y 0} {$y < 200} {incr y} {gets $f} close $f set y } 200 test io-33.10 {Tcl_Gets, exercising double buffering} { - set f [open test3 w] + set f [open $path(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 $path(test3) r] fconfigure $f -translation lf for {set y 0} {$y < 300} {incr y} {gets $f} close $f @@ -4044,7 +4097,7 @@ test io-33.10 {Tcl_Gets, exercising double buffering} { # 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 $path(longfile) r] seek $f1 0 current set c [tell $f1] close $f1 @@ -4052,12 +4105,12 @@ test io-34.1 {Tcl_Seek to current position at start of file} { } 0 test io-34.2 {Tcl_Seek to offset from start} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 10 start set c [tell $f1] close $f1 @@ -4065,12 +4118,12 @@ test io-34.2 {Tcl_Seek to offset from start} { } 10 test io-34.3 {Tcl_Seek to end of file} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 0 end set c [tell $f1] close $f1 @@ -4078,12 +4131,12 @@ test io-34.3 {Tcl_Seek to end of file} { } 54 test io-34.4 {Tcl_Seek to offset from end of file} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 -10 end set c [tell $f1] close $f1 @@ -4091,12 +4144,12 @@ test io-34.4 {Tcl_Seek to offset from end of file} { } 44 test io-34.5 {Tcl_Seek to offset from current position} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 10 current seek $f1 10 current set c [tell $f1] @@ -4105,12 +4158,12 @@ test io-34.5 {Tcl_Seek to offset from current position} { } 20 test io-34.6 {Tcl_Seek to offset from end of file} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 -10 end set c [tell $f1] set r [read $f1] @@ -4120,12 +4173,12 @@ test io-34.6 {Tcl_Seek to offset from end of file} { }} test io-34.7 {Tcl_Seek to offset from end of file, then to current position} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 -10 end set c1 [tell $f1] set r1 [read $f1 5] @@ -4135,7 +4188,7 @@ test io-34.7 {Tcl_Seek to offset from end of file, then to current position} { list $c1 $r1 $c2 } {44 rstuv 49} test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} { - set f1 [open "|[list $::tcltest::tcltest]" r+] + set f1 [open "|[list [interpreter]]" r+] set x [list [catch {seek $f1 0 current} msg] $msg] close $f1 regsub {".*":} $x {"":} x @@ -4143,11 +4196,11 @@ test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} { } {1 {error during seek on "": invalid argument}} test io-34.9 {Tcl_Seek, testing buffered input flushing} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -eofchar {} puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" close $f - set f [open test3 RDWR] + set f [open $path(test3) RDWR] set x [read $f 1] seek $f 3 lappend x [read $f 1] @@ -4164,12 +4217,15 @@ test io-34.9 {Tcl_Seek, testing buffered input flushing} { close $f set x } {a d a l Y {} b} + +set path(test3) [makeFile {} test3] + test io-34.10 {Tcl_Seek testing flushing of buffered input} { - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -translation lf puts $f xyz\n123 close $f - set f [open test3 r+] + set f [open $path(test3) r+] fconfigure $f -translation lf set x [gets $f] seek $f 0 current @@ -4179,10 +4235,10 @@ test io-34.10 {Tcl_Seek testing flushing of buffered input} { } "xyz {xyz 456}" test io-34.11 {Tcl_Seek testing flushing of buffered output} { - set f [open test3 w] + set f [open $path(test3) w] puts $f xyz\n123 close $f - set f [open test3 w+] + set f [open $path(test3) w+] puts $f xyzzy seek $f 2 set x [gets $f] @@ -4190,11 +4246,11 @@ test io-34.11 {Tcl_Seek testing flushing of buffered output} { list $x [viewFile test3] } "zzy xyzzy" test io-34.12 {Tcl_Seek testing combination of write, seek back and read} { - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -translation lf -eofchar {} puts $f xyz\n123 close $f - set f [open test3 a+] + set f [open $path(test3) a+] fconfigure $f -translation lf -eofchar {} puts $f xyzzy flush $f @@ -4208,19 +4264,19 @@ test io-34.12 {Tcl_Seek testing combination of write, seek back and read} { xyzzy} zzy} test io-34.13 {Tcl_Tell at start of file} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set p [tell $f1] close $f1 set p } 0 test io-34.14 {Tcl_Tell after seek to end of file} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 0 end set c1 [tell $f1] close $f1 @@ -4228,12 +4284,12 @@ test io-34.14 {Tcl_Tell after seek to end of file} { } 54 test io-34.15 {Tcl_Tell combined with seeking} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" puts $f1 "abcdefghijklmnopqrstuvwxyz" close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] seek $f1 10 start set c1 [tell $f1] seek $f1 10 current @@ -4242,13 +4298,13 @@ test io-34.15 {Tcl_Tell combined with seeking} { list $c1 $c2 } {10 20} test io-34.16 {Tcl_tell on pipe: always -1} {stdio} { - set f1 [open "|[list $::tcltest::tcltest]" r+] + set f1 [open "|[list [interpreter]]" r+] set c [tell $f1] close $f1 set c } -1 test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} { - set f1 [open "|[list $::tcltest::tcltest]" r+] + set f1 [open "|[list [interpreter]]" r+] puts $f1 {puts hello} flush $f1 set c [tell $f1] @@ -4258,11 +4314,11 @@ test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} { } -1 test io-34.18 {Tcl_Tell combined with seeking and reading} { removeFile test2 - set f [open test2 w] + set f [open $path(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 $path(test2)] fconfigure $f -translation lf set x [tell $f] read $f 3 @@ -4277,18 +4333,18 @@ test io-34.18 {Tcl_Tell combined with seeking and reading} { set x } {0 3 2 12 30} test io-34.19 {Tcl_Tell combined with opening in append mode} { - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -translation lf -eofchar {} puts $f "abcdefghijklmnopqrstuvwxyz" puts $f "abcdefghijklmnopqrstuvwxyz" close $f - set f [open test3 a] + set f [open $path(test3) a] set c [tell $f] close $f set c } 54 test io-34.20 {Tcl_Tell combined with writing} { - set f [open test3 w] + set f [open $path(test3) w] set l "" seek $f 29 start lappend l [tell $f] @@ -4302,16 +4358,38 @@ test io-34.20 {Tcl_Tell combined with writing} { close $f set l } {29 39 40 447} +test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} { + removeFile test3 + set f [open $path(test3) w] + fconfigure $f -encoding binary + set l "" + lappend l [tell $f] + puts -nonewline $f abcdef + lappend l [tell $f] + flush $f + lappend l [tell $f] + # 4GB offset! + seek $f 0x100000000 + lappend l [tell $f] + puts -nonewline $f abcdef + lappend l [tell $f] + close $f + lappend l [file size $f] + # truncate... + close [open $path(test3) w] + lappend l [file size $f] + set l +} {0 6 6 4294967296 4294967302 4294967302 0} # Test Tcl_Eof test io-35.1 {Tcl_Eof} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f hello puts $f hello close $f - set f [open test1] + set f [open $path(test1)] set x [eof $f] lappend x [eof $f] gets $f @@ -4326,11 +4404,11 @@ test io-35.1 {Tcl_Eof} { } {0 0 0 0 1 1} test io-35.2 {Tcl_Eof with pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 {gets stdin} puts $f1 {puts hello} close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello set x [eof $f1] flush $f1 @@ -4344,11 +4422,11 @@ test io-35.2 {Tcl_Eof with pipe} {stdio} { } {0 0 0 1} test io-35.3 {Tcl_Eof with pipe} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 {gets stdin} puts $f1 {puts hello} close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] puts $f1 hello set x [eof $f1] flush $f1 @@ -4366,9 +4444,9 @@ test io-35.3 {Tcl_Eof with pipe} {stdio} { } {0 0 0 1 1 1} test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -blocking off set l "" lappend l [gets $f] @@ -4378,12 +4456,12 @@ test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { } {{} 1} test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { removeFile pipe - set f [open pipe w] + set f [open $path(pipe) w] puts $f { exit } close $f - set f [open "|[list $::tcltest::tcltest pipe]" r] + set f [open "|[list [interpreter] $path(pipe)]" r] set l "" lappend l [gets $f] lappend l [eof $f] @@ -4392,12 +4470,12 @@ test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { } {{} 1} test io-35.6 {Tcl_Eof, eof char, lf write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4406,12 +4484,12 @@ test io-35.6 {Tcl_Eof, eof char, lf write, auto read} { } {9 8 1} test io-35.7 {Tcl_Eof, eof char, lf write, lf read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation lf -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4420,12 +4498,12 @@ test io-35.7 {Tcl_Eof, eof char, lf write, lf read} { } {9 8 1} test io-35.8 {Tcl_Eof, eof char, cr write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4434,12 +4512,12 @@ test io-35.8 {Tcl_Eof, eof char, cr write, auto read} { } {9 8 1} test io-35.9 {Tcl_Eof, eof char, cr write, cr read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation cr -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4448,12 +4526,12 @@ test io-35.9 {Tcl_Eof, eof char, cr write, cr read} { } {9 8 1} test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4462,12 +4540,12 @@ test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} { } {11 8 1} test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation crlf -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4476,13 +4554,13 @@ test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} { } {11 8 1} test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4491,13 +4569,13 @@ test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} { } {17 8 1} test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation lf -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4506,13 +4584,13 @@ test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} { } {17 8 1} test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4521,13 +4599,13 @@ test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} { } {17 8 1} test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation cr -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4536,13 +4614,13 @@ test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} { } {17 8 1} test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation auto -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4551,13 +4629,13 @@ test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { } {21 8 1} test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { removeFile test1 - set f [open test1 w] + set f [open $path(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 $path(test1)] + set f [open $path(test1) r] fconfigure $f -translation crlf -eofchar \x1a set l [string length [read $f]] set e [eof $f] @@ -4568,7 +4646,7 @@ test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { # Test Tcl_InputBlocked test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} { - set f1 [open "|[list $::tcltest::tcltest]" r+] + set f1 [open "|[list [interpreter]]" r+] puts $f1 {puts hello_from_pipe} flush $f1 gets $f1 @@ -4587,7 +4665,7 @@ test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} { set x } {{} 1 hello 0 {} 1} test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} { - set f1 [open "|[list $::tcltest::tcltest]" r+] + set f1 [open "|[list [interpreter]]" r+] fconfigure $f1 -buffering line puts $f1 {puts hello_from_pipe} set x "" @@ -4602,10 +4680,10 @@ test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} { } {hello_from_pipe 0 {} 0 1} test io-36.3 {Tcl_InputBlocked vs files, short read} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f abcdefghijklmnop close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" lappend l [fblocked $f] lappend l [read $f 3] @@ -4618,27 +4696,29 @@ test io-36.3 {Tcl_InputBlocked vs files, short read} { } {0 abc 0 defghijklmnop 0 1} test io-36.4 {Tcl_InputBlocked vs files, event driven read} { proc in {f} { - global l x + variable l + variable x lappend l [read $f 3] if {[eof $f]} {lappend l eof; close $f; set x done} } removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f abcdefghijklmnop close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - fileevent $f readable [list in $f] - vwait x + fileevent $f readable [namespace code [list in $f]] + variable x + vwait [namespace which -variable x] set l } {abc def ghi jkl mno {p } eof} test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f abcdefghijklmnop close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -blocking off set l "" lappend l [fblocked $f] @@ -4652,27 +4732,29 @@ test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles } {0 abc 0 defghijklmnop 0 1} test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} { proc in {f} { - global l x + variable l + variable x lappend l [read $f 3] if {[eof $f]} {lappend l eof; close $f; set x done} } removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] puts $f abcdefghijklmnop close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -blocking off set l "" - fileevent $f readable [list in $f] - vwait x + fileevent $f readable [namespace code [list in $f]] + variable x + vwait [namespace which -variable x] set l } {abc def ghi jkl mno {p } eof} # Test Tcl_InputBuffered -test io-37.1 {Tcl_InputBuffered} { - set f [open longfile r] +test io-37.1 {Tcl_InputBuffered} {testchannel} { + set f [open $path(longfile) r] fconfigure $f -buffersize 4096 read $f 3 set l "" @@ -4681,8 +4763,8 @@ test io-37.1 {Tcl_InputBuffered} { close $f set l } {4093 3} -test io-37.2 {Tcl_InputBuffered, test input flushing on seek} { - set f [open longfile r] +test io-37.2 {Tcl_InputBuffered, test input flushing on seek} {testchannel} { + set f [open $path(longfile) r] fconfigure $f -buffersize 4096 read $f 3 set l "" @@ -4698,13 +4780,13 @@ test io-37.2 {Tcl_InputBuffered, test input flushing on seek} { # Test Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize test io-38.1 {Tcl_GetChannelBufferSize, default buffer size} { - set f [open longfile r] + set f [open $path(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 $path(longfile) r] set l "" lappend l [fconfigure $f -buffersize] fconfigure $f -buffersize 10000 @@ -4723,11 +4805,22 @@ test io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} { set l } {4096 10000 4096 4096 4096 100000 4096} +test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} { + # This test crashes the interp if Bug #427196 is not fixed + + set chan [open [info script] r] + fconfigure $chan -buffersize 10 + set var [read $chan 2] + fconfigure $chan -buffersize 32 + append var [read $chan] + close $chan +} {} + # Test Tcl_SetChannelOption, Tcl_GetChannelOption test io-39.1 {Tcl_GetChannelOption} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set x [fconfigure $f1 -blocking] close $f1 set x @@ -4737,14 +4830,14 @@ test io-39.1 {Tcl_GetChannelOption} { # test io-39.2 {Tcl_GetChannelOption} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set x [fconfigure $f1 -buffering] close $f1 set x } full test io-39.3 {Tcl_GetChannelOption} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -buffering line set x [fconfigure $f1 -buffering] close $f1 @@ -4752,7 +4845,7 @@ test io-39.3 {Tcl_GetChannelOption} { } line test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set l "" lappend l [fconfigure $f1 -buffering] fconfigure $f1 -buffering line @@ -4768,7 +4861,7 @@ test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { } {full line none line full} test io-39.5 {Tcl_GetChannelOption, invariance} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set l "" lappend l [fconfigure $f1 -buffering] lappend l [list [catch {fconfigure $f1 -buffering green} msg] $msg] @@ -4778,53 +4871,53 @@ test io-39.5 {Tcl_GetChannelOption, invariance} { } {full {1 {bad value for -buffering: must be one of full, line, or none}} full} test io-39.6 {Tcl_SetChannelOption, multiple options} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] fconfigure $f1 -translation lf -buffering line puts $f1 hello puts $f1 bye - set x [file size test1] + set x [file size $path(test1)] close $f1 set x } 10 test io-39.7 {Tcl_SetChannelOption, buffering, translation} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(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 $path(test1)] puts $f1 really_bye - lappend x [file size test1] + lappend x [file size $path(test1)] close $f1 set x } {0 21} test io-39.8 {Tcl_SetChannelOption, different buffering options} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] set l "" fconfigure $f1 -translation lf -buffering none -eofchar {} puts -nonewline $f1 hello - lappend l [file size test1] + lappend l [file size $path(test1)] puts -nonewline $f1 hello - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f1 -buffering full puts -nonewline $f1 hello - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f1 -buffering none - lappend l [file size test1] + lappend l [file size $path(test1)] puts -nonewline $f1 hello - lappend l [file size test1] + lappend l [file size $path(test1)] close $f1 - lappend l [file size test1] + lappend l [file size $path(test1)] set l } {5 10 10 10 20 20} test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { removeFile test1 - set f1 [open test1 w] + set f1 [open $path(test1) w] close $f1 - set f1 [open test1 r] + set f1 [open $path(test1) r] set x "" lappend x [fconfigure $f1 -blocking] fconfigure $f1 -blocking off @@ -4838,7 +4931,7 @@ test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { } {1 0 {} {} 0 1} test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 { gets stdin after 100 @@ -4847,7 +4940,7 @@ test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { } close $f1 set x "" - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] fconfigure $f1 -blocking off -buffering line lappend x [fconfigure $f1 -blocking] lappend x [gets $f1] @@ -4874,7 +4967,7 @@ test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { } {0 {} 1 {} 1 {} 1 1 hi 0 0 {} 1} test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffersize -10 set x [fconfigure $f -buffersize] close $f @@ -4882,7 +4975,7 @@ test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { } 4096 test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffersize 10000000 set x [fconfigure $f -buffersize] close $f @@ -4890,7 +4983,7 @@ test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { } 4096 test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -buffersize 40000 set x [fconfigure $f -buffersize] close $f @@ -4898,11 +4991,11 @@ test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { } 40000 test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding {} puts -nonewline $f \xe7\x89\xa6 close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -encoding utf-8 set x [read $f] close $f @@ -4910,11 +5003,11 @@ test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} { } \u7266 test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -encoding binary puts -nonewline $f \xe7\x89\xa6 close $f - set f [open test1 r] + set f [open $path(test1) r] fconfigure $f -encoding utf-8 set x [read $f] close $f @@ -4922,30 +5015,30 @@ test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} { } \u7266 test io-39.16 {Tcl_SetChannelOption: -encoding, errors} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] set result [list [catch {fconfigure $f -encoding foobar} msg] $msg] close $f set result } {1 {unknown encoding "foobar"}} test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio} { - set f [open "|[list $::tcltest::tcltest cat]" r+] + set f [open "|[list [interpreter] $path(cat)]" r+] fconfigure $f -encoding binary puts -nonewline $f "\xe7" flush $f fconfigure $f -encoding utf-8 -blocking 0 - set x {} - fileevent $f readable { lappend x [read $f] } - vwait x - after 300 { lappend x timeout } - vwait x + variable x {} + fileevent $f readable [namespace code { lappend x [read $f] }] + vwait [namespace which -variable x] + after 300 [namespace code { lappend x timeout }] + vwait [namespace which -variable x] fconfigure $f -encoding utf-8 - vwait x - after 300 { lappend x timeout } - vwait x + vwait [namespace which -variable x] + after 300 [namespace code { lappend x timeout }] + vwait [namespace which -variable x] fconfigure $f -encoding binary - vwait x - after 300 { lappend x timeout } - vwait x + vwait [namespace which -variable x] + after 300 [namespace code { lappend x timeout }] + vwait [namespace which -variable x] close $f set x } "{} timeout {} timeout \xe7 timeout" @@ -4953,7 +5046,7 @@ test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} test io-39.18 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} - set s1 [socket -server accept 0] + set s1 [socket -server [namespace code accept] 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -4966,7 +5059,7 @@ test io-39.18 {Tcl_SetChannelOption, setting read mode independently} \ test io-39.19 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} - set s1 [socket -server accept 0] + set s1 [socket -server [namespace code accept] 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -4979,7 +5072,7 @@ test io-39.19 {Tcl_SetChannelOption, setting read mode independently} \ test io-39.20 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} - set s1 [socket -server accept 0] + set s1 [socket -server [namespace code accept] 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -4992,7 +5085,7 @@ test io-39.20 {Tcl_SetChannelOption, setting read mode independently} \ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} - set s1 [socket -server accept 0] + set s1 [socket -server [namespace code accept] 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -5003,29 +5096,74 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \ set modes } {auto crlf} +test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} { + removeFile test1 + set f1 [open $path(test1) w+] + set l "" + lappend l [fconfigure $f1 -eofchar] + fconfigure $f1 -eofchar {ON GO} + lappend l [fconfigure $f1 -eofchar] + fconfigure $f1 -eofchar D + lappend l [fconfigure $f1 -eofchar] + close $f1 + set l +} {{{} {}} {O G} {D D}} + +test io-39.22a {Tcl_SetChannelOption, invariance} { + removeFile test1 + set f1 [open $path(test1) w+] + set l [list] + fconfigure $f1 -eofchar {ON GO} + lappend l [fconfigure $f1 -eofchar] + fconfigure $f1 -eofchar D + lappend l [fconfigure $f1 -eofchar] + lappend l [list [catch {fconfigure $f1 -eofchar {1 2 3}} msg] $msg] + close $f1 + set l +} {{O G} {D D} {1 {bad value for -eofchar: should be a list of zero, one, or two elements}}} + + +test io-39.23 {Tcl_GetChannelOption, server socket is not readable or + writeable, it should still have valid -eofchar and -translation options } { + set l [list] + set sock [socket -server [namespace code accept] 0] + lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation] + close $sock + set l +} {{{}} auto} +test io-39.24 {Tcl_SetChannelOption, server socket is not readable or + writable so we can't change -eofchar or -translation } { + set l [list] + set sock [socket -server [namespace code accept] 0] + fconfigure $sock -eofchar D -translation lf + lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation] + close $sock + set l +} {{{}} auto} + test io-40.1 {POSIX open access modes: RDWR} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] puts $f xyzzy close $f - set f [open test3 RDWR] + set f [open $path(test3) RDWR] puts -nonewline $f "ab" seek $f 0 current set x [gets $f] close $f - set f [open test3 r] + set f [open $path(test3) r] lappend x [gets $f] close $f set x } {zzy abzzy} test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { removeFile test3 - set f [open test3 {WRONLY CREAT} 0600] - file stat test3 stats + set f [open $path(test3) {WRONLY CREAT} 0600] + file stat $path(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 $path(test3) r] lappend x [gets $f] close $f set x @@ -5033,44 +5171,44 @@ test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { # some tests can only be run is umask is 2 # if "umask" cannot be run, the tests will be skipped. -catch {set ::tcltest::testConstraints(umask2) [expr {[exec umask] == 2}]} +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. removeFile test3 - set f [open test3 {WRONLY CREAT}] + set f [open $path(test3) {WRONLY CREAT}] close $f file stat test3 stats format "0%o" [expr $stats(mode)&0777] } 0664 test io-40.4 {POSIX open access modes: CREAT} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -eofchar {} puts $f xyzzy close $f - set f [open test3 {WRONLY CREAT}] + set f [open $path(test3) {WRONLY CREAT}] fconfigure $f -eofchar {} puts -nonewline $f "ab" close $f - set f [open test3 r] + set f [open $path(test3) r] set x [gets $f] close $f set x } abzzy test io-40.5 {POSIX open access modes: APPEND} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] fconfigure $f -translation lf -eofchar {} puts $f xyzzy close $f - set f [open test3 {WRONLY APPEND}] + set f [open $path(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 $path(test3) r] fconfigure $f -translation lf set x "" seek $f 6 current @@ -5081,16 +5219,17 @@ test io-40.5 {POSIX open access modes: APPEND} { } {{new line} abc} test io-40.6 {POSIX open access modes: EXCL} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] puts $f xyzzy close $f - set msg [list [catch {open test3 {WRONLY CREAT EXCL}} msg] $msg] + set msg [list [catch {open $path(test3) {WRONLY CREAT EXCL}} msg] $msg] regsub " already " $msg " " msg + regsub [file join {} $path(test3)] $msg "test3" msg string tolower $msg } {1 {couldn't open "test3": file exists}} test io-40.7 {POSIX open access modes: EXCL} { removeFile test3 - set f [open test3 {WRONLY CREAT EXCL}] + set f [open $path(test3) {WRONLY CREAT EXCL}] fconfigure $f -eofchar {} puts $f "A test line" close $f @@ -5098,33 +5237,33 @@ test io-40.7 {POSIX open access modes: EXCL} { } {A test line} test io-40.8 {POSIX open access modes: TRUNC} { removeFile test3 - set f [open test3 w] + set f [open $path(test3) w] puts $f xyzzy close $f - set f [open test3 {WRONLY TRUNC}] + set f [open $path(test3) {WRONLY TRUNC}] puts $f abc close $f - set f [open test3 r] + set f [open $path(test3) r] set x [gets $f] close $f set x } abc test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} { removeFile test3 - set f [open test3 {WRONLY NONBLOCK CREAT}] + set f [open $path(test3) {WRONLY NONBLOCK CREAT}] puts $f "NONBLOCK test" close $f - set f [open test3 r] + set f [open $path(test3) r] set x [gets $f] close $f set x } {NONBLOCK test} test io-40.10 {POSIX open access modes: RDONLY} { - set f [open test1 w] + set f [open $path(test1) w] puts $f "two lines: this one" puts $f "and this" close $f - set f [open test1 RDONLY] + set f [open $path(test1) RDONLY] set x [list [gets $f] [catch {puts $f Test} msg] $msg] close $f string compare [string tolower $x] \ @@ -5133,15 +5272,19 @@ test io-40.10 {POSIX open access modes: RDONLY} { } 0 test io-40.11 {POSIX open access modes: RDONLY} { removeFile test3 - string tolower [list [catch {open test3 RDONLY} msg] $msg] + set msg [list [catch {open $path(test3) RDONLY} msg] $msg] + regsub [file join {} $path(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} { removeFile test3 - string tolower [list [catch {open test3 WRONLY} msg] $msg] + set msg [list [catch {open $path(test3) WRONLY} msg] $msg] + regsub [file join {} $path(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} { makeFile xyzzy test3 - set f [open test3 WRONLY] + set f [open $path(test3) WRONLY] fconfigure $f -eofchar {} puts -nonewline $f "ab" seek $f 0 current @@ -5153,11 +5296,13 @@ test io-40.13 {POSIX open access modes: WRONLY} { } 0 test io-40.14 {POSIX open access modes: RDWR} { removeFile test3 - string tolower [list [catch {open test3 RDWR} msg] $msg] + set msg [list [catch {open $path(test3) RDWR} msg] $msg] + regsub [file join {} $path(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} { makeFile xyzzy test3 - set f [open test3 RDWR] + set f [open $path(test3) RDWR] puts -nonewline $f "ab" seek $f 0 current set x [gets $f] @@ -5202,7 +5347,8 @@ test io-41.5 {Tcl_FileeventCmd: errors} { # Test fileevent on a file # -set f [open foo w+] +set path(foo) [makeFile {} foo] +set f [open $path(foo) w+] test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} { list [fileevent $f readable] [fileevent $f writable] @@ -5264,65 +5410,59 @@ test io-43.2 {Tcl_FileeventCmd: deleting when many present} {stdio unixExecs} { } {{} {} {} {read f} {read f2} {read f3} {read f} {} {read f3} {read f} {} {} {} {} {}} test io-44.1 {FileEventProc procedure: normal read event} {stdio unixExecs} { - fileevent $f2 readable { + fileevent $f2 readable [namespace code { set x [gets $f2]; fileevent $f2 readable {} - } + }] puts $f2 text; flush $f2 - set x initial - vwait x + variable x initial + vwait [namespace which -variable x] set x } {text} test io-44.2 {FileEventProc procedure: error in read event} {stdio unixExecs} { - proc bgerror args { - global x - set x $args - } + proc ::bgerror args "set [namespace which -variable x] \$args" fileevent $f2 readable {error bogus} puts $f2 text; flush $f2 - set x initial - vwait x - rename bgerror {} + variable x initial + vwait [namespace which -variable x] + rename ::bgerror {} list $x [fileevent $f2 readable] } {bogus {}} test io-44.3 {FileEventProc procedure: normal write event} {stdio unixExecs} { - fileevent $f2 writable { + fileevent $f2 writable [namespace code { lappend x "triggered" incr count -1 if {$count <= 0} { fileevent $f2 writable {} } - } - set x initial + }] + variable x initial set count 3 - vwait x - vwait x - vwait x + vwait [namespace which -variable x] + vwait [namespace which -variable x] + vwait [namespace which -variable x] set x } {initial triggered triggered triggered} test io-44.4 {FileEventProc procedure: eror in write event} {stdio unixExecs} { - proc bgerror args { - global x - set x $args - } + proc ::bgerror args "set [namespace which -variable x] \$args" fileevent $f2 writable {error bad-write} - set x initial - vwait x - rename bgerror {} + variable x initial + vwait [namespace which -variable x] + rename ::bgerror {} list $x [fileevent $f2 writable] } {bad-write {}} test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs} { - set f4 [open "|[list $::tcltest::tcltest cat << foo]" r] - fileevent $f4 readable { + set f4 [open "|[list [interpreter] $path(cat) << foo]" r] + fileevent $f4 readable [namespace code { if {[gets $f4 line] < 0} { lappend x eof fileevent $f4 readable {} } else { lappend x $line } - } - set x initial - vwait x - vwait x + }] + variable x initial + vwait [namespace which -variable x] + vwait [namespace which -variable x] close $f4 set x } {initial foo eof} @@ -5334,38 +5474,39 @@ catch {close $f3} close $f makeFile "foo bar" foo test io-45.1 {DeleteFileEvent, cleanup on close} { - set f [open foo r] - fileevent $f readable { + set f [open $path(foo) r] + fileevent $f readable [namespace code { lappend x "binding triggered: \"[gets $f]\"" fileevent $f readable {} - } + }] close $f set x initial - after 100 { set y done } - vwait y + after 100 [namespace code { set y done }] + variable y + vwait [namespace which -variable y] set x } {initial} test io-45.2 {DeleteFileEvent, cleanup on close} { - set f [open foo r] - set f2 [open foo r] - fileevent $f readable { + set f [open $path(foo) r] + set f2 [open $path(foo) r] + fileevent $f readable [namespace code { lappend x "f triggered: \"[gets $f]\"" fileevent $f readable {} - } - fileevent $f2 readable { + }] + fileevent $f2 readable [namespace code { lappend x "f2 triggered: \"[gets $f2]\"" fileevent $f2 readable {} - } + }] close $f - set x initial - vwait x + variable x initial + vwait [namespace which -variable x] close $f2 set x } {initial {f2 triggered: "foo bar"}} test io-45.3 {DeleteFileEvent, cleanup on close} { - set f [open foo r] - set f2 [open foo r] - set f3 [open foo r] + set f [open $path(foo) r] + set f2 [open $path(foo) r] + set f3 [open $path(foo) r] fileevent $f readable {f script} fileevent $f2 readable {f2 script} fileevent $f3 readable {f3 script} @@ -5385,34 +5526,33 @@ test io-45.3 {DeleteFileEvent, cleanup on close} { } {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. +testConstraint testfevent [llength [info commands testfevent]] -if {[info commands testfevent] == "testfevent"} { - - test io-46.1 {Tcl event loop vs multiple interpreters} {} { +test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent} { testfevent create - testfevent cmd { - set f [open foo r] + testfevent cmd [format { + set f [open %s r] set x "no event" - fileevent $f readable { + fileevent $f readable [namespace code { set x "f triggered: [gets $f]" fileevent $f readable {} - } - } + }] + } $path(foo)] after 1 ;# We must delay because Windows takes a little time to notice update 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} { +test io-46.2 {Tcl event loop vs multiple interpreters} testfevent { testfevent create testfevent cmd { - set x 0 + variable x 0 after 100 {set x triggered} - vwait x + vwait [namespace which -variable x] set x } } {triggered} -test io-46.3 {Tcl event loop vs multiple interpreters} { +test io-46.3 {Tcl event loop vs multiple interpreters} testfevent { testfevent create testfevent cmd { set x 0 @@ -5426,10 +5566,10 @@ test io-46.3 {Tcl event loop vs multiple interpreters} { } } {0 0 {0 timer}} -test io-47.1 {fileevent vs multiple interpreters} { - set f [open foo r] - set f2 [open foo r] - set f3 [open foo r] +test io-47.1 {fileevent vs multiple interpreters} testfevent { + set f [open $path(foo) r] + set f2 [open $path(foo) r] + set f3 [open $path(foo) r] fileevent $f readable {script 1} testfevent create testfevent share $f2 @@ -5445,11 +5585,11 @@ test io-47.1 {fileevent vs multiple interpreters} { close $f3 set x } {{} {script 1} {} {sript 3}} -test io-47.2 {deleting fileevent on interpreter delete} { - set f [open foo r] - set f2 [open foo r] - set f3 [open foo r] - set f4 [open foo r] +test io-47.2 {deleting fileevent on interpreter delete} testfevent { + set f [open $path(foo) r] + set f2 [open $path(foo) r] + set f3 [open $path(foo) r] + set f4 [open $path(foo) r] fileevent $f readable {script 1} testfevent create testfevent share $f2 @@ -5466,11 +5606,11 @@ test io-47.2 {deleting fileevent on interpreter delete} { close $f4 set x } {{script 1} {} {} {script 4}} -test io-47.3 {deleting fileevent on interpreter delete} { - set f [open foo r] - set f2 [open foo r] - set f3 [open foo r] - set f4 [open foo r] +test io-47.3 {deleting fileevent on interpreter delete} testfevent { + set f [open $path(foo) r] + set f2 [open $path(foo) r] + set f3 [open $path(foo) r] + set f4 [open $path(foo) r] testfevent create testfevent share $f3 testfevent share $f4 @@ -5487,9 +5627,9 @@ test io-47.3 {deleting fileevent on interpreter delete} { close $f4 set x } {{script 1} {script 2} {} {}} -test io-47.4 {file events on shared files and multiple interpreters} { - set f [open foo r] - set f2 [open foo r] +test io-47.4 {file events on shared files and multiple interpreters} testfevent { + set f [open $path(foo) r] + set f2 [open $path(foo) r] testfevent create testfevent share $f testfevent cmd "fileevent $f readable {script 1}" @@ -5503,8 +5643,8 @@ test io-47.4 {file events on shared files and multiple interpreters} { close $f2 set x } {{script 3} {script 1} {script 2}} -test io-47.5 {file events on shared files, deleting file events} { - set f [open foo r] +test io-47.5 {file events on shared files, deleting file events} testfevent { + set f [open $path(foo) r] testfevent create testfevent share $f testfevent cmd "fileevent $f readable {script 1}" @@ -5516,8 +5656,8 @@ test io-47.5 {file events on shared files, deleting file events} { close $f set x } {{} {script 2}} -test io-47.6 {file events on shared files, deleting file events} { - set f [open foo r] +test io-47.6 {file events on shared files, deleting file events} testfevent { + set f [open $path(foo) r] testfevent create testfevent share $f testfevent cmd "fileevent $f readable {script 1}" @@ -5530,22 +5670,21 @@ test io-47.6 {file events on shared files, deleting file events} { set x } {{script 1} {}} -} - -# The above curly closes the test for presence of the "testfevent" command. +set path(bar) [makeFile {} bar] test io-48.1 {testing readability conditions} { - set f [open bar w] + set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg close $f - set f [open bar r] - fileevent $f readable [list consume $f] + set f [open $path(bar) r] + fileevent $f readable [namespace code [list consume $f]] proc consume {f} { - global x l + variable l + variable x lappend l called if {[eof $f]} { close $f @@ -5555,23 +5694,24 @@ test io-48.1 {testing readability conditions} { } } set l "" - set x not_done - vwait x + variable x not_done + vwait [namespace which -variable x] list $x $l } {done {called called called called called called called}} test io-48.2 {testing readability conditions} {nonBlockFiles} { - set f [open bar w] + set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg close $f - set f [open bar r] - fileevent $f readable [list consume $f] + set f [open $path(bar) r] + fileevent $f readable [namespace code [list consume $f]] fconfigure $f -blocking off proc consume {f} { - global x l + variable x + variable l lappend l called if {[eof $f]} { close $f @@ -5581,19 +5721,22 @@ test io-48.2 {testing readability conditions} {nonBlockFiles} { } } set l "" - set x not_done - vwait x + variable x not_done + vwait [namespace which -variable x] list $x $l } {done {called called called called called called called}} -test io-48.3 {testing readability conditions} {unixOnly nonBlockFiles} { - set f [open bar w] + +set path(my_script) [makeFile {} my_script] + +test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} { + set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg puts $f abcdefg close $f - set f [open my_script w] + set f [open $path(my_script) w] puts $f { proc copy_slowly {f} { while {![eof $f]} { @@ -5604,12 +5747,13 @@ test io-48.3 {testing readability conditions} {unixOnly nonBlockFiles} { } } close $f - set f [open "|[list $::tcltest::tcltest]" r+] - fileevent $f readable [list consume $f] + set f [open "|[list [interpreter]]" r+] + fileevent $f readable [namespace code [list consume $f]] fconfigure $f -buffering line fconfigure $f -blocking off proc consume {f} { - global x l + variable l + variable x if {[eof $f]} { set x done } else { @@ -5620,24 +5764,26 @@ test io-48.3 {testing readability conditions} {unixOnly nonBlockFiles} { } } set l "" - set x not_done - puts $f {source my_script} - puts $f {set f [open bar r]} + variable x not_done + puts $f [format {source %s} $path(my_script)] + puts $f [format {set f [open %s r]} $path(bar)] puts $f {copy_slowly $f} puts $f {exit} - vwait x + vwait [namespace which -variable x] close $f 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} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable c + variable x if {[eof $f]} { set x done close $f @@ -5648,21 +5794,24 @@ 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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable x + variable c if {[eof $f]} { set x done close $f @@ -5673,21 +5822,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable x + variable c if {[eof $f]} { set x done close $f @@ -5698,21 +5850,24 @@ 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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable c + variable x if {[eof $f]} { set x done close $f @@ -5723,21 +5878,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable x + variable c if {[eof $f]} { set x done close $f @@ -5748,21 +5906,24 @@ 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 $path(test1) r] fconfigure $f -translation auto -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable c + variable x if {[eof $f]} { set x done close $f @@ -5773,21 +5934,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation auto - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable c + variable x if {[eof $f]} { set x done close $f @@ -5798,21 +5962,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation lf - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable x + variable c if {[eof $f]} { set x done close $f @@ -5823,21 +5990,24 @@ 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 $path(test1) r] fconfigure $f -translation lf -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable l + variable x + variable c if {[eof $f]} { set x done close $f @@ -5848,21 +6018,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation cr - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable c + variable x + variable l if {[eof $f]} { set x done close $f @@ -5873,21 +6046,24 @@ 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 $path(test1) r] fconfigure $f -translation cr -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%cfoo\nbar\n" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable c + variable x + variable l if {[eof $f]} { set x done close $f @@ -5898,21 +6074,24 @@ 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 $path(test1) r] fconfigure $f -eofchar \x1a -translation crlf - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { - global c x l + variable c + variable x + variable l if {[eof $f]} { set x done close $f @@ -5923,22 +6102,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 $path(test1) r] fconfigure $f -translation crlf -eofchar \x1a - fileevent $f readable [list consume $f] - vwait x + fileevent $f readable [namespace code [list consume $f]] + variable x + vwait [namespace which -variable x] list $c $l } {3 {abc def {}}} test io-49.1 {testing crlf reading, leftover cr disgorgment} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f -translation crlf lappend l [read $f 1] lappend l [tell $f] @@ -5961,13 +6141,13 @@ test io-49.1 {testing crlf reading, leftover cr disgorgment} { } 7 0 {} 1" test io-49.2 {testing crlf reading, leftover cr disgorgment} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f -translation crlf lappend l [read $f 2] lappend l [tell $f] @@ -5984,13 +6164,13 @@ test io-49.2 {testing crlf reading, leftover cr disgorgment} { } "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} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f -translation crlf lappend l [read $f 3] lappend l [tell $f] @@ -6005,13 +6185,13 @@ test io-49.3 {testing crlf reading, leftover cr disgorgment} { } "7 [list a\rb] 3 [list \rc\n] 7 0 {} 7 1" test io-49.4 {testing crlf reading, leftover cr disgorgment} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f -translation crlf lappend l [read $f 3] lappend l [tell $f] @@ -6026,13 +6206,13 @@ test io-49.4 {testing crlf reading, leftover cr disgorgment} { } "7 [list a\rb] 3 [list \rc] 7 0 {} 7 1" test io-49.5 {testing crlf reading, leftover cr disgorgment} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" close $f - set f [open test1 r] + set f [open $path(test1) r] set l "" - lappend l [file size test1] + lappend l [file size $path(test1)] fconfigure $f -translation crlf lappend l [set x [gets $f]] lappend l [tell $f] @@ -6043,14 +6223,15 @@ test io-49.5 {testing crlf reading, leftover cr disgorgment} { set l } [list 7 a\rb\rc 7 {} 7 1] -test io-50.1 {testing handler deletion} {} { +testConstraint testchannelevent [llength [info commands testchannelevent]] +test io-50.1 {testing handler deletion} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list delhandler $f] + set f [open $path(test1) r] + testchannelevent $f add readable [namespace code [list delhandler $f]] proc delhandler {f} { - global z + variable z set z called testchannelevent $f delete 0 } @@ -6059,15 +6240,15 @@ test io-50.1 {testing handler deletion} {} { close $f set z } called -test io-50.2 {testing handler deletion with multiple handlers} {} { +test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list delhandler $f 1] - testchannelevent $f add readable [list delhandler $f 0] + set f [open $path(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} { - global z + variable z lappend z "called delhandler $f $i" testchannelevent $f delete 0 } @@ -6077,20 +6258,20 @@ test io-50.2 {testing handler deletion with multiple handlers} {} { 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} {} { +test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list notcalled $f 1] - testchannelevent $f add readable [list delhandler $f 0] + set f [open $path(test1) r] + testchannelevent $f add readable [namespace code [list notcalled $f 1]] + testchannelevent $f add readable [namespace code [list delhandler $f 0]] set z "" proc notcalled {f i} { - global z + variable z lappend z "notcalled was called!! $f $i" } proc delhandler {f i} { - global z + variable z testchannelevent $f delete 1 lappend z "delhandler $f $i called" testchannelevent $f delete 0 @@ -6103,14 +6284,15 @@ test io-50.3 {testing handler deletion with multiple handlers} {} { [list [list delhandler $f 0 called] \ [list delhandler $f 0 deleted myself]] } 0 -test io-50.4 {testing handler deletion vs reentrant calls} {} { +test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list delrecursive $f] + set f [open $path(test1) r] + testchannelevent $f add readable [namespace code [list delrecursive $f]] proc delrecursive {f} { - global z u + variable z + variable u if {"$u" == "recursive"} { testchannelevent $f delete 0 lappend z "delrecursive deleting recursive" @@ -6127,19 +6309,20 @@ test io-50.4 {testing handler deletion vs reentrant calls} {} { string compare [string tolower $z] \ {{delrecursive calling recursive} {delrecursive deleting recursive}} } 0 -test io-50.5 {testing handler deletion vs reentrant calls} {} { +test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list notcalled $f] - testchannelevent $f add readable [list del $f] + set f [open $path(test1) r] + testchannelevent $f add readable [namespace code [list notcalled $f]] + testchannelevent $f add readable [namespace code [list del $f]] proc notcalled {f} { - global z + variable z lappend z "notcalled was called!! $f" } proc del {f} { - global z u + variable u + variable z if {"$u" == "recursive"} { testchannelevent $f delete 1 testchannelevent $f delete 0 @@ -6160,15 +6343,16 @@ test io-50.5 {testing handler deletion vs reentrant calls} {} { [list {del calling recursive} {del deleted notcalled} \ {del deleted myself} {del after update}] } 0 -test io-50.6 {testing handler deletion vs reentrant calls} {} { +test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} { removeFile test1 - set f [open test1 w] + set f [open $path(test1) w] close $f - set f [open test1 r] - testchannelevent $f add readable [list second $f] - testchannelevent $f add readable [list first $f] + set f [open $path(test1) r] + testchannelevent $f add readable [namespace code [list second $f]] + testchannelevent $f add readable [namespace code [list first $f]] proc first {f} { - global u z + variable u + variable z if {"$u" == "toplevel"} { lappend z "first called" set u first @@ -6179,7 +6363,8 @@ test io-50.6 {testing handler deletion vs reentrant calls} {} { } } proc second {f} { - global u z + variable u + variable z if {"$u" == "first"} { lappend z "second called, first time" set u second @@ -6206,34 +6391,35 @@ test io-51.1 {Test old socket deletion on Macintosh} {socket} { set x 0 set result "" proc accept {s a p} { - global x wait + variable x + variable wait fconfigure $s -blocking off puts $s "sock[incr x]" close $s set wait done } - set ss [socket -server accept 2831] - set wait "" - set cs [socket [info hostname] 2831] - vwait wait + set ss [socket -server [namespace code accept] 0] + variable wait "" + set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] 2831] - vwait wait + set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] 2831] - vwait wait + set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] 2831] - vwait wait + set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + vwait [namespace which -variable wait] lappend result [gets $cs] close $cs close $ss @@ -6243,7 +6429,7 @@ test io-51.1 {Test old socket deletion on Macintosh} {socket} { test io-52.1 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(test1) w] fcopy $f1 $f2 -command { # } catch { fcopy $f1 $f2 } msg close $f1 @@ -6253,7 +6439,7 @@ test io-52.1 {TclCopyChannel} { test io-52.2 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(test1) w] set f3 [open $thisScript] fcopy $f1 $f2 -command { # } catch { fcopy $f3 $f2 } msg @@ -6265,7 +6451,7 @@ test io-52.2 {TclCopyChannel} { test io-52.3 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 fconfigure $f2 -translation cr -blocking 0 set s0 [fcopy $f1 $f2] @@ -6273,7 +6459,7 @@ test io-52.3 {TclCopyChannel} { close $f1 close $f2 set s1 [file size $thisScript] - set s2 [file size test1] + set s2 [file size $path(test1)] if {("$s1" == "$s2") && ($s0 == $s1)} { lappend result ok } @@ -6282,19 +6468,19 @@ test io-52.3 {TclCopyChannel} { test io-52.4 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(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] + lappend result [file size $path(test1)] } {0 0 40} test io-52.5 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 fconfigure $f2 -translation lf -blocking 0 fcopy $f1 $f2 -size -1 @@ -6302,7 +6488,7 @@ test io-52.5 {TclCopyChannel} { close $f1 close $f2 set s1 [file size $thisScript] - set s2 [file size test1] + set s2 [file size $path(test1)] if {"$s1" == "$s2"} { lappend result ok } @@ -6311,7 +6497,7 @@ test io-52.5 {TclCopyChannel} { test io-52.6 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(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]] @@ -6319,7 +6505,7 @@ test io-52.6 {TclCopyChannel} { close $f1 close $f2 set s1 [file size $thisScript] - set s2 [file size test1] + set s2 [file size $path(test1)] if {("$s1" == "$s2") && ($s0 == $s1)} { lappend result ok } @@ -6328,13 +6514,13 @@ test io-52.6 {TclCopyChannel} { test io-52.7 {TclCopyChannel} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(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 $path(test1)] close $f1 close $f2 if {"$s1" == "$s2"} { @@ -6345,7 +6531,7 @@ test io-52.7 {TclCopyChannel} { test io-52.8 {TclCopyChannel} {stdio} { removeFile test1 removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] fconfigure $f1 -translation lf puts $f1 " puts ready @@ -6356,65 +6542,145 @@ test io-52.8 {TclCopyChannel} {stdio} { close \$f1 " close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] fconfigure $f1 -translation lf gets $f1 puts $f1 ready flush $f1 - set f2 [open test1 w] + set f2 [open $path(test1) w] fconfigure $f2 -translation lf set s0 [fcopy $f1 $f2 -size 40] catch {close $f1} close $f2 - list $s0 [file size test1] + list $s0 [file size $path(test1)] } {40 40} +# Empty files, to register them with the test facility +set path(kyrillic.txt) [makeFile {} kyrillic.txt] +set path(utf8-fcopy.txt) [makeFile {} utf8-fcopy.txt] +set path(utf8-rp.txt) [makeFile {} utf8-rp.txt] + +# Create kyrillic file, use lf translation to avoid os eol issues +set out [open $path(kyrillic.txt) w] +fconfigure $out -encoding koi8-r -translation lf +puts $out "\u0410\u0410" +close $out + +test io-52.9 {TclCopyChannel & encodings} { + # Copy kyrillic to UTF-8, using fcopy. + + set in [open $path(kyrillic.txt) r] + set out [open $path(utf8-fcopy.txt) w] + + fconfigure $in -encoding koi8-r -translation lf + fconfigure $out -encoding utf-8 -translation lf + + fcopy $in $out + close $in + close $out + + # Do the same again, but differently (read/puts). + + set in [open $path(kyrillic.txt) r] + set out [open $path(utf8-rp.txt) w] + + fconfigure $in -encoding koi8-r -translation lf + fconfigure $out -encoding utf-8 -translation lf + + puts -nonewline $out [read $in] + + close $in + close $out + + list [file size $path(kyrillic.txt)] \ + [file size $path(utf8-fcopy.txt)] \ + [file size $path(utf8-rp.txt)] +} {3 5 5} + +test io-52.10 {TclCopyChannel & encodings} { + # encoding to binary (=> implies that the + # internal utf-8 is written) + + set in [open $path(kyrillic.txt) r] + set out [open $path(utf8-fcopy.txt) w] + + fconfigure $in -encoding koi8-r -translation lf + # -translation binary is also -encoding binary + fconfigure $out -translation binary + + fcopy $in $out + close $in + close $out + + file size $path(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 $path(utf8-fcopy.txt) r] + set out [open $path(kyrillic.txt) w] + + # -translation binary is also -encoding binary + fconfigure $in -translation binary + fconfigure $out -encoding koi8-r -translation lf + + fcopy $in $out + close $in + close $out + + file size $path(kyrillic.txt) +} 3 + + test io-53.1 {CopyData} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(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] + lappend result [file size $path(test1)] } {0 0 0} test io-53.2 {CopyData} { removeFile test1 set f1 [open $thisScript] - set f2 [open test1 w] + set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 fconfigure $f2 -translation cr -blocking 0 - fcopy $f1 $f2 -command {set s0} + fcopy $f1 $f2 -command [namespace code {set s0}] set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]] - vwait s0 + variable s0 + vwait [namespace which -variable s0] close $f1 close $f2 set s1 [file size $thisScript] - set s2 [file size test1] + set s2 [file size $path(test1)] if {("$s1" == "$s2") && ($s0 == $s1)} { lappend result ok } set result } {0 0 ok} -test io-53.3 {CopyData: background read underflow} {unixOnly} { +test io-53.3 {CopyData: background read underflow} {stdio unixOnly} { removeFile test1 removeFile pipe - set f1 [open pipe w] - puts $f1 { + set f1 [open $path(pipe) w] + puts $f1 [format { puts ready flush stdout ;# Don't assume line buffered! fcopy stdin stdout -command { set x } vwait x - set f [open test1 w] + set f [open "%s" w] fconfigure $f -translation lf puts $f "done" close $f - } + } $path(test1)] close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] set result [gets $f1] puts $f1 line1 flush $f1 @@ -6424,43 +6690,44 @@ test io-53.3 {CopyData: background read underflow} {unixOnly} { lappend result [gets $f1] close $f1 after 500 - set f [open test1] + set f [open $path(test1)] lappend result [read $f] close $f set result } "ready line1 line2 {done\n}" -test io-53.4 {CopyData: background write overflow} {unixOnly} { +test io-53.4 {CopyData: background write overflow} {stdio unixOnly} { set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n + variable x for {set x 0} {$x < 12} {incr x} { append big $big } removeFile test1 removeFile pipe - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 { puts ready fcopy stdin stdout -command { set x } vwait x - set f [open test1 w] + set f [open $path(test1) w] fconfigure $f -translation lf puts $f "done" close $f } close $f1 - set f1 [open "|[list $::tcltest::tcltest pipe]" r+] + set f1 [open "|[list [interpreter] $path(pipe)]" r+] set result [gets $f1] fconfigure $f1 -blocking 0 puts $f1 $big flush $f1 after 500 set result "" - fileevent $f1 read { + fileevent $f1 read [namespace code { append result [read $f1 1024] if {[string length $result] >= [string length $big]} { set x done } - } - vwait x + }] + vwait [namespace which -variable x] close $f1 set big {} set x @@ -6471,7 +6738,7 @@ proc FcopyTestAccept {sock args} { after 1000 "close $sock" } proc FcopyTestDone {bytes {error {}}} { - global fcopyTestDone + variable fcopyTestDone if {[string length $error]} { set fcopyTestDone 1 } else { @@ -6480,65 +6747,123 @@ proc FcopyTestDone {bytes {error {}}} { } test io-53.5 {CopyData: error during fcopy} {socket} { - set listen [socket -server FcopyTestAccept 2828] + variable fcopyTestDone + set listen [socket -server [namespace code FcopyTestAccept] 0] set in [open $thisScript] ;# 126 K - set out [socket 127.0.0.1 2828] + set out [socket 127.0.0.1 [lindex [fconfigure $listen -sockname] 2]] catch {unset fcopyTestDone} close $listen ;# This means the socket open never really succeeds - fcopy $in $out -command FcopyTestDone + fcopy $in $out -command [namespace code FcopyTestDone] + variable fcopyTestDone if ![info exists fcopyTestDone] { - vwait fcopyTestDone ;# The error occurs here in the b.g. + vwait [namespace which -variable fcopyTestDone] ;# The error occurs here in the b.g. } close $in close $out set fcopyTestDone ;# 1 for error condition } 1 test io-53.6 {CopyData: error during fcopy} {stdio} { + variable fcopyTestDone removeFile pipe removeFile test1 catch {unset fcopyTestDone} - set f1 [open pipe w] + set f1 [open $path(pipe) w] puts $f1 "exit 1" close $f1 - set in [open "|[list $::tcltest::tcltest pipe]" r+] - set out [open test1 w] - fcopy $in $out -command [list FcopyTestDone] + set in [open "|[list [interpreter] $path(pipe)]" r+] + set out [open $path(test1) w] + fcopy $in $out -command [namespace code FcopyTestDone] + variable fcopyTestDone if ![info exists fcopyTestDone] { - vwait fcopyTestDone + vwait [namespace which -variable fcopyTestDone] } catch {close $in} close $out set fcopyTestDone ;# 0 for plain end of file } {0} +proc doFcopy {in out {bytes 0} {error {}}} { + variable fcopyTestDone + variable fcopyTestCount + incr fcopyTestCount $bytes + if {[string length $error]} { + set fcopyTestDone 1 + } elseif {[eof $in]} { + set fcopyTestDone 0 + } else { + # Delay next fcopy to wait for size>0 input bytes + after 100 [list + fcopy $in $out -size 1000 \ + -command [namespace code [list doFcopy $in $out]] + ] + } +} + +test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio} { + variable fcopyTestDone + removeFile pipe + removeFile test1 + catch {unset fcopyTestDone} + set fcopyTestCount 0 + set f1 [open $path(pipe) w] + puts $f1 { + # Write 10 bytes / 10 msec + proc Write {count} { + puts -nonewline "1234567890" + if {[incr count -1]} { + after 10 [list Write $count] + } else { + set ::ready 1 + } + } + fconfigure stdout -buffering none + Write 345 ;# 3450 bytes ~3.45 sec + vwait ready + exit 0 + } + close $f1 + set in [open "|[list [interpreter] $path(pipe) &]" r+] + set out [open $path(test1) w] + doFcopy $in $out + variable fcopyTestDone + if ![info exists fcopyTestDone] { + vwait [namespace which -variable fcopyTestDone] + } + catch {close $in} + close $out + # -1=error 0=script error N=number of bytes + expr ($fcopyTestDone == 0) ? $fcopyTestCount : -1 +} {3450} + test io-54.1 {Recursive channel events} {socket} { # This test checks to see if file events are delivered during recursive # event loops when there is buffered data on the channel. proc accept {s a p} { - global as + variable as fconfigure $s -translation lf puts $s "line 1\nline2\nline3" flush $s set as $s } proc readit {s next} { - global result x + variable x + variable result lappend result $next if {$next == 1} { - fileevent $s readable [list readit $s 2] - vwait x + fileevent $s readable [namespace code [list readit $s 2]] + vwait [namespace which -variable x] } incr x } - set ss [socket -server accept 2828] + set ss [socket -server [namespace code accept] 0] # We need to delay on some systems until the creation of the # server socket completes. set done 0 for {set i 0} {$i < 10} {incr i} { - if {![catch {set cs [socket [info hostname] 2828]}]} { + if {![catch {set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]]}]} { set done 1 break } @@ -6548,15 +6873,16 @@ test io-54.1 {Recursive channel events} {socket} { close $ss error "failed to connect to server" } - set result {} - set x 0 - vwait as + variable result {} + variable x 0 + variable as + vwait [namespace which -variable as] fconfigure $cs -translation lf lappend result [gets $cs] fconfigure $cs -blocking off - fileevent $cs readable [list readit $cs 1] - set a [after 2000 { set x failure }] - vwait x + fileevent $cs readable [namespace code [list readit $cs 1]] + set a [after 2000 [namespace code { set x failure }]] + vwait [namespace which -variable x] after cancel $a close $as close $ss @@ -6566,27 +6892,30 @@ test io-54.1 {Recursive channel events} {socket} { test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { set accept {} set after {} - set s [socket -server accept 3939] + variable s [socket -server [namespace code accept] 0] proc accept {s a p} { - global counter accept + variable counter + variable accept set accept $s set counter 0 fconfigure $s -blocking off -buffering line -translation lf - fileevent $s readable "doit $s" + fileevent $s readable [namespace code "doit $s"] } proc doit {s} { - global counter after + variable counter + variable after incr counter set l [gets $s] if {"$l" == ""} { - fileevent $s readable "doit1 $s" - set after [after 1000 newline] + fileevent $s readable [namespace code "doit1 $s"] + set after [after 1000 [namespace code newline]] } } proc doit1 {s} { - global counter accept + variable counter + variable accept incr counter set l [gets $s] @@ -6594,22 +6923,25 @@ test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { set accept {} } proc producer {} { - global writer + variable s + variable writer - set writer [socket 127.0.0.1 3939] + set writer [socket 127.0.0.1 [lindex [fconfigure $s -sockname] 2]] fconfigure $writer -buffering line puts -nonewline $writer hello flush $writer } proc newline {} { - global writer done + variable done + variable writer puts $writer hello flush $writer set done 1 } producer - vwait done + variable done + vwait [namespace which -variable done] close $writer close $s after cancel $after @@ -6617,58 +6949,63 @@ test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { set counter } 1 +set path(fooBar) [makeFile {} fooBar] + test io-55.1 {ChannelEventScriptInvoker: deletion} { + variable x proc eventScript {fd} { + variable x close $fd error "planned error" - set ::x whoops + set x whoops } - proc bgerror {args} { - set ::x got_error - } - set f [open fooBar w] - fileevent $f writable [list eventScript $f] - set x not_done - vwait x + proc ::bgerror {args} "set [namespace which -variable x] got_error" + set f [open $path(fooBar) w] + fileevent $f writable [namespace code [list eventScript $f]] + variable x not_done + vwait [namespace which -variable x] set x } {got_error} -test io-56.1 {ChannelTimerProc} { - set f [open fooBar w] +test io-56.1 {ChannelTimerProc} {testchannelevent} { + set f [open $path(fooBar) w] puts $f "this is a test" close $f - set f [open fooBar r] - testchannelevent $f add readable { + set f [open $path(fooBar) r] + testchannelevent $f add readable [namespace code { read $f 1 incr x - } - set x 0 - vwait x - vwait x + }] + variable x 0 + vwait [namespace which -variable x] + vwait [namespace which -variable x] set result $x testchannelevent $f set 0 none - after idle {set y done} - vwait y + after idle [namespace code {set y done}] + variable y + vwait [namespace which -variable y] close $f lappend result $y } {2 done} test io-57.1 {buffered data and file events, gets} { proc accept {sock args} { - set ::s2 $sock + variable s2 + set s2 $sock } - set server [socket -server accept 4040] - set s [socket 127.0.0.1 4040] - vwait s2 + set server [socket -server [namespace code accept] 0] + set s [socket 127.0.0.1 [lindex [fconfigure $server -sockname] 2]] + variable s2 + vwait [namespace which -variable s2] update - fileevent $s2 readable {lappend result readable} + fileevent $s2 readable [namespace code {lappend result readable}] puts $s "12\n34567890" flush $s - set result [gets $s2] - after 1000 {lappend result timer} - vwait result + variable result [gets $s2] + after 1000 [namespace code {lappend result timer}] + vwait [namespace which -variable result] lappend result [gets $s2] - vwait result + vwait [namespace which -variable result] close $s close $s2 close $server @@ -6676,35 +7013,38 @@ test io-57.1 {buffered data and file events, gets} { } {12 readable 34567890 timer} test io-57.2 {buffered data and file events, read} { proc accept {sock args} { - set ::s2 $sock + variable s2 + set s2 $sock } - set server [socket -server accept 4041] - set s [socket 127.0.0.1 4041] - vwait s2 + set server [socket -server [namespace code accept] 0] + set s [socket 127.0.0.1 [lindex [fconfigure $server -sockname] 2]] + variable s2 + vwait [namespace which -variable s2] update - fileevent $s2 readable {lappend result readable} + fileevent $s2 readable [namespace code {lappend result readable}] puts -nonewline $s "1234567890" flush $s - set result [read $s2 1] - after 1000 {lappend result timer} - vwait result + variable result [read $s2 1] + after 1000 [namespace code {lappend result timer}] + vwait [namespace which -variable result] lappend result [read $s2 9] - vwait result + vwait [namespace which -variable result] close $s close $s2 close $server set result } {1 readable 234567890 timer} -test io-58.1 {Tcl_NotifyChannel and error when closing} {unixOrPc} { - set out [open script w] +test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc} { + set out [open $path(script) w] puts $out { puts "normal message from pipe" puts stderr "error message from pipe" exit 1 } proc readit {pipe} { - global x result + variable x + variable result if {[eof $pipe]} { set x [catch {close $pipe} line] lappend result catch $line @@ -6714,33 +7054,70 @@ test io-58.1 {Tcl_NotifyChannel and error when closing} {unixOrPc} { } } close $out - set pipe [open "|[list $::tcltest::tcltest] script" r] - fileevent $pipe readable [list readit $pipe] - set x "" + set pipe [open "|[list [interpreter] $path(script)]" r] + fileevent $pipe readable [namespace code [list readit $pipe]] + variable x "" set result "" - vwait x + vwait [namespace which -variable x] list $x $result } {1 {gets {normal message from pipe} gets {} catch {error message from pipe}}} -# cleanup -foreach file [list fooBar longfile script output test1 pipe my_script foo \ - bar test2 test3 cat stdout] { - ::tcltest::removeFile $file -} -::tcltest::restoreState -::tcltest::cleanupTests -return - - - - +testConstraint testmainthread [llength [info commands testmainthread]] +test io-59.1 {Thread reference of channels} {testmainthread testchannel} { + # TIP #10 + # More complicated tests (like that the reference changes as a + # channel is moved from thread to thread) can be done only in the + # extension which fully implements the moving of channels between + # threads, i.e. 'Threads'. Or we have to extend [testthread] as well. + set f [open $path(longfile) r] + set result [testchannel mthread $f] + close $f + string equal $result [testmainthread] +} {1} +test io-60.1 {writing illegal utf sequences} { + # This test will hang in older revisions of the core. + set out [open $path(script) w] + puts $out { + puts [encoding convertfrom identity \xe2] + exit 1 + } + proc readit {pipe} { + variable x + variable result + if {[eof $pipe]} { + set x [catch {close $pipe} line] + lappend result catch $line + } else { + gets $pipe line + lappend result gets $line + } + } + close $out + set pipe [open "|[list [interpreter] $path(script)]" r] + fileevent $pipe readable [namespace code [list readit $pipe]] + variable x "" + set result "" + vwait [namespace which -variable x] + # cut of the remainder of the error stack, especially the filename + set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]] + list $x $result +} {1 {gets {} catch {error writing "stdout": invalid argument}}} +# cleanup +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 +return |