diff options
Diffstat (limited to 'tests/io.test')
| -rw-r--r-- | tests/io.test | 1977 |
1 files changed, 1363 insertions, 614 deletions
diff --git a/tests/io.test b/tests/io.test index d74fa9d..edc0b11 100644 --- a/tests/io.test +++ b/tests/io.test @@ -1,3 +1,4 @@ +# -*- tcl -*- # Functionality covered: operation of all IO commands, and all procedures # defined in generic/tclIO.c. # @@ -11,32 +12,47 @@ # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: io.test,v 1.40 2003/02/25 22:03:38 andreas_kupries Exp $ 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::loadTestedCommands +catch [list package require -exact Tcltest [info patchlevel]] -testConstraint testchannel [llength [info commands testchannel]] -testConstraint exec [llength [info commands exec]] +namespace eval ::tcl::test::io { + namespace import ::tcltest::* + + variable umaskValue + variable path + variable f + variable i + variable n + variable v + variable msg + variable expected + +testConstraint testchannel [llength [info commands testchannel]] +testConstraint exec [llength [info commands exec]] +testConstraint openpipe 1 +testConstraint fileevent [llength [info commands fileevent]] +testConstraint fcopy [llength [info commands fcopy]] +testConstraint testfevent [llength [info commands testfevent]] +testConstraint testchannelevent [llength [info commands testchannelevent]] +testConstraint testmainthread [llength [info commands testmainthread]] +testConstraint thread [expr {0 == [catch {package require Thread 2.7-}]}] # 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 +# some tests can only be run is umask is 2 +# if "umask" cannot be run, the tests will be skipped. +set umaskValue 0 +testConstraint umask [expr {![catch {set umaskValue [scan [exec /bin/sh -c umask] %o]}]}] + +testConstraint makeFileInHome [expr {![file exists ~/_test_] && [file writable ~]}] # set up a long data file for some of the following tests @@ -82,9 +98,7 @@ 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 $path(test1) w] fconfigure $f -encoding binary @@ -99,9 +113,7 @@ test io-1.7 {Tcl_WriteChars: WriteChars} { close $f 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. # @@ -116,6 +128,66 @@ test io-1.8 {Tcl_WriteChars: WriteChars} { contents $path(test2) } " \x1b\$B\$O\x1b(B" +test io-1.9 {Tcl_WriteChars: WriteChars} { + # When closing a channel with an encoding that appends + # escape bytes, check for the case where the escape + # bytes overflow the current IO buffer. The bytes + # should be moved into a new buffer. + + set data "1234567890 [format %c 12399]" + + set sizes [list] + + # With default buffer size + set f [open $path(test2) w] + fconfigure $f -encoding iso2022-jp + puts -nonewline $f $data + close $f + lappend sizes [file size $path(test2)] + + # With buffer size equal to the length + # of the data, the escape bytes would + # go into the next buffer. + + set f [open $path(test2) w] + fconfigure $f -encoding iso2022-jp -buffersize 16 + puts -nonewline $f $data + close $f + lappend sizes [file size $path(test2)] + + # With buffer size that is large enough + # to hold 1 byte of escaped data, but + # not all 3. This should not write + # the escape bytes to the first buffer + # and then again to the second buffer. + + set f [open $path(test2) w] + fconfigure $f -encoding iso2022-jp -buffersize 17 + puts -nonewline $f $data + close $f + lappend sizes [file size $path(test2)] + + # With buffer size that can hold 2 out of + # 3 bytes of escaped data. + + set f [open $path(test2) w] + fconfigure $f -encoding iso2022-jp -buffersize 18 + puts -nonewline $f $data + close $f + lappend sizes [file size $path(test2)] + + # With buffer size that can hold all the + # data and escape bytes. + + set f [open $path(test2) w] + fconfigure $f -encoding iso2022-jp -buffersize 19 + puts -nonewline $f $data + close $f + lappend sizes [file size $path(test2)] + + set sizes +} {19 19 19 19 19} + test io-2.1 {WriteBytes} { # loop until all bytes are written @@ -355,7 +427,7 @@ test io-6.1 {Tcl_GetsObj: working} { close $f set x } {foo} -test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} { +test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} emptyTest { # no test, need to cause an async error. } {} test io-6.3 {Tcl_GetsObj: how many have we used?} { @@ -407,10 +479,10 @@ test io-6.6 {Tcl_GetsObj: loop test} { close $f set x } [list 256 $a] -test io-6.7 {Tcl_GetsObj: error in input} {stdio} { +test io-6.7 {Tcl_GetsObj: error in input} {stdio openpipe} { # if (FilterInputBytes(chanPtr, &gs) != 0) - set f [open "|[list [interpreter] cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] puts -nonewline $f "hi\nwould" flush $f gets $f @@ -439,9 +511,7 @@ test io-6.9 {Tcl_GetsObj: remember if EOF is seen} { close $f set x } {11 abcdefghijk 3 wom} - # Comprehensive tests - test io-6.10 {Tcl_GetsObj: lf mode: no chars} { set f [open $path(test1) w] close $f @@ -669,7 +739,7 @@ test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} {testchannel} { close $f set x } [list 15 "123456789012345" 15] -test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio testchannel} { +test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio testchannel openpipe fileevent} { # (FilterInputBytes() != 0) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -808,7 +878,7 @@ test io-6.42 {Tcl_GetsObj: auto mode: several chars} { close $f set x } [list 4 "abcd" 4 "efgh" 4 "ijkl" 4 "mnop" -1 ""] -test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel} { +test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel openpipe fileevent} { # if (chanPtr->flags & INPUT_SAW_CR) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -825,7 +895,7 @@ test io-6.43 {Tcl_GetsObj: input saw cr} {stdio testchannel} { 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 testchannel} { +test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio testchannel openpipe fileevent} { # not (*eol == '\n') set f [open "|[list [interpreter] $path(cat)]" w+] @@ -842,7 +912,7 @@ test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio testchannel} 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 testchannel} { +test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio testchannel openpipe fileevent} { # Tcl_ExternalToUtf() set f [open "|[list [interpreter] $path(cat)]" w+] @@ -859,7 +929,7 @@ test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio test 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 testchannel} { +test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {stdio testchannel openpipe fileevent} { # memmove() set f [open "|[list [interpreter] $path(cat)]" w+] @@ -984,7 +1054,7 @@ test io-6.55 {Tcl_GetsObj: overconverted} { close $f set x } [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"] -test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} { +test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio openpipe fileevent} { update set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -buffering none @@ -1044,7 +1114,7 @@ test io-7.3 {FilterInputBytes: split up character at EOF} {testchannel} { close $f set x } [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""] -test io-7.4 {FilterInputBytes: recover from split up character} {stdio} { +test io-7.4 {FilterInputBytes: recover from split up character} {stdio openpipe fileevent} { set f [open "|[list [interpreter] $path(cat)]" w+] fconfigure $f -encoding binary -buffering none puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82" @@ -1079,7 +1149,7 @@ test io-8.1 {PeekAhead: only go to device if no more cached data} {testchannel} close $f set x } "7" -test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio testchannel} { +test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio testchannel openpipe fileevent} { # not (bufPtr->nextPtr == NULL) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1099,7 +1169,7 @@ test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio testcha close $f set x } [list -1 "" 42 15 "123456789012345" 25] -test io-8.3 {PeekAhead: no cached data available} {stdio testchannel} { +test io-8.3 {PeekAhead: no cached data available} {stdio testchannel openpipe fileevent} { # (bytesLeft == 0) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1132,7 +1202,7 @@ 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 testchannel} { +test io-8.5 {PeekAhead: don't peek if last read was short} {stdio testchannel openpipe fileevent} { # (bufPtr->nextAdded < bufPtr->length) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1144,7 +1214,7 @@ test io-8.5 {PeekAhead: don't peek if last read was short} {stdio testchannel} { close $f set x } {15 abcdefghijklmno 1} -test io-8.6 {PeekAhead: change to non-blocking mode} {stdio testchannel} { +test io-8.6 {PeekAhead: change to non-blocking mode} {stdio testchannel openpipe fileevent} { # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1156,7 +1226,7 @@ test io-8.6 {PeekAhead: change to non-blocking mode} {stdio testchannel} { close $f set x } {15 abcdefghijklmno 1} -test io-8.7 {PeekAhead: cleanup} {stdio testchannel} { +test io-8.7 {PeekAhead: cleanup} {stdio testchannel openpipe fileevent} { # Make sure bytes are removed from buffer. set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1169,12 +1239,11 @@ test io-8.7 {PeekAhead: cleanup} {stdio testchannel} { close $f set x } {15 abcdefghijklmno 1 -1 {}} - -test io-9.1 {CommonGetsCleanup} { +test io-9.1 {CommonGetsCleanup} emptyTest { } {} -test io-10.1 {Tcl_ReadChars: CheckChannelErrors} { +test io-10.1 {Tcl_ReadChars: CheckChannelErrors} emptyTest { # no test, need to cause an async error. } {} test io-10.2 {Tcl_ReadChars: loop until enough copied} { @@ -1284,7 +1353,7 @@ test io-11.4 {ReadBytes: EOF char found} { close $f set x } [list "abcdefghijkl" 1 "" 1] - + test io-12.1 {ReadChars: want to read a lot} { # ((unsigned) toRead > (unsigned) srcLen) @@ -1322,7 +1391,7 @@ test io-12.3 {ReadChars: allocate more space} { close $f set x } {abcdefghijklmnopqrstuvwxyz} -test io-12.4 {ReadChars: split-up char} {stdio testchannel} { +test io-12.4 {ReadChars: split-up char} {stdio testchannel openpipe fileevent} { # (srcRead == 0) set f [open "|[list [interpreter] $path(cat)]" w+] @@ -1347,7 +1416,7 @@ test io-12.4 {ReadChars: split-up char} {stdio testchannel} { close $f set x } [list "123456789012345" 1 "\u672c" 0] -test io-12.5 {ReadChars: fileevents on partial characters} {stdio} { +test io-12.5 {ReadChars: fileevents on partial characters} {stdio openpipe fileevent} { set path(test1) [makeFile { fconfigure stdout -encoding binary -buffering none gets stdin; puts -nonewline "\xe7" @@ -1442,7 +1511,7 @@ test io-13.5 {TranslateInputEOL: crlf mode: naked lf} { close $f set x } "abcd\ndef\nfgh" -test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testchannel} { +test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testchannel openpipe fileevent} { # (chanPtr->flags & INPUT_SAW_CR) # This test may fail on slower machines. @@ -1468,7 +1537,7 @@ test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio testc close $f set x } [list "abcdefghj\n" 1 "01234" 0] -test io-13.7 {TranslateInputEOL: auto mode: naked \r} {testchannel} { +test io-13.7 {TranslateInputEOL: auto mode: naked \r} {testchannel openpipe} { # (src >= srcMax) set f [open $path(test1) w] @@ -1544,17 +1613,13 @@ test io-13.12 {TranslateInputEOL: find EOF char in src} { close $f set x } "\n\n\nab\n\nd" - + # Test standard handle management. The functions tested are # Tcl_SetStdChannel and Tcl_GetStdChannel. Incidentally we are # also testing channel table management. if {[info commands testchannel] != ""} { - if {$tcl_platform(platform) == "macintosh"} { - set consoleFileNames [list console0 console1 console2] - } else { - set consoleFileNames [lsort [testchannel open]] - } + set consoleFileNames [lsort [testchannel open]] } else { # just to avoid an error set consoleFileNames [list] @@ -1577,25 +1642,24 @@ test io-14.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} { interp delete x set l } {line line none} - set path(test3) [makeFile {} test3] - -test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} { +test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec openpipe} { set f [open $path(test1) w] - puts $f [format { + puts -nonewline $f { close stdin close stdout close stderr - set f [open "%s" r] - set f2 [open "%s" w] - set f3 [open "%s" w] - puts stdout [gets stdin] + set f [} + puts $f [list open $path(test1) r]] + puts $f "set f2 \[[list open $path(test2) w]]" + puts $f "set f3 \[[list open $path(test3) w]]" + puts $f { 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 [interpreter] $path(test1)] set f [open $path(test2) r] @@ -1608,22 +1672,23 @@ test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} { out } {err }} -# This test relies on the fact that the smallest available fd is used first. -test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unixOnly} { +# This test relies on the fact that stdout is used before stderr +test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} { set f [open $path(test1) w] - puts $f [format { close stdin + puts -nonewline $f { close stdin close stdout close stderr - set f [open "%s" r] - set f2 [open "%s" w] - set f3 [open "%s" w] - puts stdout [gets stdin] + set f [} + puts $f [list open $path(test1) r]] + puts $f "set f2 \[[list open $path(test2) w]]" + puts $f "set f3 \[[list open $path(test3) w]]" + puts $f { 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 [interpreter] $path(test1)] set f [open $path(test2) r] @@ -1633,8 +1698,8 @@ test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unixOnly} { close $f2 set result } {{ close stdin -file1 -} {file2 +stdout +} {stderr }} catch {interp delete z} test io-14.5 {Tcl_GetChannel: stdio name translation} { @@ -1667,31 +1732,32 @@ 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 +test io-14.8 {reuse of stdio special channels} {stdio openpipe} { + file delete $path(script) + file delete $path(test1) set f [open $path(script) w] - puts $f [format { + puts -nonewline $f { close stderr - set f [open "%s" w] + set f [} + puts $f [list open $path(test1) w]] + puts -nonewline $f { puts stderr hello close $f - set f [open "%s" r] + set f [} + puts $f [list open $path(test1) r]] + puts $f { puts [gets $f] - } $path(test1) $path(test1)] + } close $f 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 +test io-14.9 {reuse of stdio special channels} {stdio openpipe fileevent} { + file delete $path(script) + file delete $path(test1) set f [open $path(script) w] puts $f { array set path [lindex $argv 0] @@ -1706,13 +1772,19 @@ test io-14.9 {reuse of stdio special channels} {stdio} { set f [open "|[list [interpreter] $path(script) [array get path]]" r] set c [gets $f] close $f + # Added delay to give Windows time to stop the spawned process and clean + # up its grip on the file test1. Added delete as proper test cleanup. + # The failing tests were 18.1 and 18.2 as first re-users of file "test1". + after 10000 + file delete $path(script) + file delete $path(test1) set c } hello -test io-15.1 {Tcl_CreateCloseHandler} { +test io-15.1 {Tcl_CreateCloseHandler} emptyTest { } {} -test io-16.1 {Tcl_DeleteCloseHandler} { +test io-16.1 {Tcl_DeleteCloseHandler} emptyTest { } {} # Test channel table management. The functions tested are @@ -1760,7 +1832,7 @@ test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} {testchannel} } {0 1 0} test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { - removeFile test1 + file delete -force $path(test1) set l "" set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] @@ -1774,7 +1846,7 @@ test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { [list 1 [format "can not find channel named \"%s\"" $f]] } 0 test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { - removeFile test1 + file delete -force $path(test1) set l "" set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] @@ -1795,7 +1867,7 @@ test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { [list 1 2 1 1 [format "can not find channel named \"%s\"" $f]] } 0 test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {testchannel} { - removeFile test1 + file delete $path(test1) set l "" set f [open $path(test1) w] lappend l [lindex [testchannel info $f] 15] @@ -1818,7 +1890,7 @@ test io-19.1 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} { eof stdin } 0 test io-19.2 {testing Tcl_GetChannel, user opened handle} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] set x [eof $f] close $f @@ -1828,7 +1900,7 @@ test io-19.3 {Tcl_GetChannel, channel not found} { list [catch {eof file34} msg] $msg } {1 {can not find channel named "file34"}} test io-19.4 {Tcl_CreateChannel, insertion into channel table} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] set l "" lappend l [eof $f] @@ -1853,56 +1925,50 @@ test io-20.1 {Tcl_CreateChannel: initial settings} { close $a set x } {ascii} -test io-20.2 {Tcl_CreateChannel: initial settings} {pcOnly} { +test io-20.2 {Tcl_CreateChannel: initial settings} {win} { 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} { +test io-20.3 {Tcl_CreateChannel: initial settings} {unix} { 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 $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} { +test io-20.5 {Tcl_CreateChannel: install channel in empty slot} {stdio openpipe} { set f [open $path(script) w] - puts $f [format { + puts -nonewline $f { close stdout - set f1 [open "%s" w] + set f1 [} + puts $f [list open $path(stdout) w]] + puts $f { fconfigure $f1 -buffersize 777 puts stderr [fconfigure stdout -buffersize] - } $path(stdout)] + } close $f set f [open "|[list [interpreter] $path(script)]"] catch {close $f} msg set msg } {777} - -test io-21.1 {CloseChannelsOnExit} { + +test io-21.1 {CloseChannelsOnExit} emptyTest { } {} - + # Test management of attributes associated with a channel, such as # its default translation, its name and type, etc. The functions # tested in this group are Tcl_GetChannelName, # Tcl_GetChannelType and Tcl_GetChannelFile. Tcl_GetChannelInstanceData # not tested because files do not use the instance data. -test io-22.1 {Tcl_GetChannelMode} { +test io-22.1 {Tcl_GetChannelMode} emptyTest { # Not used anywhere in Tcl. } {} test io-23.1 {Tcl_GetChannelName} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] set n [testchannel name $f] close $f @@ -1910,7 +1976,7 @@ test io-23.1 {Tcl_GetChannelName} {testchannel} { } 0 test io-24.1 {Tcl_GetChannelType} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] set t [testchannel type $f] close $f @@ -1931,7 +1997,7 @@ test io-25.1 {Tcl_GetChannelHandle, input} {testchannel} { set l } {10 11} test io-25.2 {Tcl_GetChannelHandle, output} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello @@ -1942,11 +2008,11 @@ test io-25.2 {Tcl_GetChannelHandle, output} {testchannel} { lappend l [testchannel outputbuffered $f] lappend l [tell $f] close $f - removeFile test1 + file delete $path(test1) set l } {6 6 0 6} -test io-26.1 {Tcl_GetChannelInstanceData} {stdio} { +test io-26.1 {Tcl_GetChannelInstanceData} {stdio openpipe} { # "pid" command uses Tcl_GetChannelInstanceData # Don't care what pid is (but must be a number), just want to exercise it. @@ -1958,7 +2024,7 @@ test io-26.1 {Tcl_GetChannelInstanceData} {stdio} { # Test flushing. The functions tested here are FlushChannel. test io-27.1 {FlushChannel, no output buffered} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] flush $f set s [file size $path(test1)] @@ -1966,7 +2032,7 @@ test io-27.1 {FlushChannel, no output buffered} { set s } 0 test io-27.2 {FlushChannel, some output buffered} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set l "" @@ -1979,7 +2045,7 @@ test io-27.2 {FlushChannel, some output buffered} { set l } {0 6 6} test io-27.3 {FlushChannel, implicit flush on close} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set l "" @@ -1990,7 +2056,7 @@ test io-27.3 {FlushChannel, implicit flush on close} { set l } {0 6} test io-27.4 {FlushChannel, implicit flush when buffer fills} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} fconfigure $f -buffersize 60 @@ -2007,7 +2073,7 @@ test io-27.4 {FlushChannel, implicit flush when buffer fills} { } {0 60 72} test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \ {unixOrPc} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffersize 60 -eofchar {} set l "" @@ -2020,24 +2086,24 @@ test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \ 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 + {stdio asyncPipeClose openpipe} { + # This test may fail on old Unix systems (seen on IRIX64 6.5) with + # obsolete gettimeofday() calls. See Tcl Bugs 3530533, 1942197. + file delete $path(pipe) + file delete $path(output) set f [open $path(pipe) w] - puts $f [format { - set f [open "%s" w] + puts $f "set f \[[list open $path(output) w]]" + puts $f { 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} { @@ -2051,9 +2117,8 @@ test io-27.6 {FlushChannel, async flushing, async close} \ close $f set counter 0 while {([file size $path(output)] < 65536) && ($counter < 1000)} { - incr counter - after 20 - update + after 20 [list incr [namespace which -variable counter]] + vwait [namespace which -variable counter] } if {$counter == 1000} { set result "file size only [file size $path(output)]" @@ -2065,7 +2130,7 @@ 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} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] interp create x interp share "" $f x @@ -2078,7 +2143,7 @@ test io-28.1 {CloseChannel called when all references are dropped} {testchannel} set l } {2 1} test io-28.2 {CloseChannel called when all references are dropped} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] interp create x interp share "" $f x @@ -2093,9 +2158,9 @@ test io-28.2 {CloseChannel called when all references are dropped} { set l } abcdef test io-28.3 {CloseChannel, not called before output queue is empty} \ - {stdio asyncPipeClose nonPortable} { - removeFile pipe - removeFile output + {stdio asyncPipeClose nonPortable openpipe} { + file delete $path(pipe) + file delete $path(output) set f [open $path(pipe) w] puts $f { @@ -2128,9 +2193,8 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ close $f set counter 0 while {([file size $path(output)] < 20480) && ($counter < 1000)} { - incr counter - after 20 - update + after 20 [list incr [namespace which -variable counter]] + vwait [namespace which -variable counter] } if {$counter == 1000} { set result probably_broken @@ -2139,7 +2203,7 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \ } } ok test io-28.4 {Tcl_Close} {testchannel} { - removeFile test1 + file delete $path(test1) set l "" lappend l [lsort [testchannel open]] set f [open $path(test1) w] @@ -2147,12 +2211,12 @@ test io-28.4 {Tcl_Close} {testchannel} { close $f lappend l [lsort [testchannel open]] set x [list $consoleFileNames \ - [lsort [eval list $consoleFileNames $f]] \ + [lsort [list {*}$consoleFileNames $f]] \ $consoleFileNames] string compare $l $x } 0 -test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly testchannel} { - removeFile script +test io-28.5 {Tcl_Close vs standard handles} {stdio unix testchannel openpipe} { + file delete $path(script) set f [open $path(script) w] puts $f { close stdin @@ -2162,14 +2226,14 @@ test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly testchannel} { set f [open "|[list [interpreter] $path(script)]" r] set l [gets $f] close $f - set l + lsort $l } {file1 file2} test io-29.1 {Tcl_WriteChars, channel not writable} { list [catch {puts stdin hello} msg] $msg } {1 {channel "stdin" wasn't opened for writing}} test io-29.2 {Tcl_WriteChars, empty string} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -eofchar {} puts -nonewline $f "" @@ -2177,7 +2241,7 @@ test io-29.2 {Tcl_WriteChars, empty string} { file size $path(test1) } 0 test io-29.3 {Tcl_WriteChars, nonempty string} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -eofchar {} puts -nonewline $f hello @@ -2185,7 +2249,7 @@ test io-29.3 {Tcl_WriteChars, nonempty string} { file size $path(test1) } 5 test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffering full -eofchar {} puts $f hello @@ -2199,7 +2263,7 @@ test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} {testchannel} { set l } {6 0 0 6} test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffering line -eofchar {} puts -nonewline $f hello @@ -2213,7 +2277,7 @@ test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} {testchannel} { set l } {5 0 0 11} test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffering none -eofchar {} puts -nonewline $f hello @@ -2226,9 +2290,8 @@ test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} {testchannel} { close $f set l } {0 5 0 11} - test io-29.7 {Tcl_Flush, full buffering} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffering full -eofchar {} puts -nonewline $f hello @@ -2245,7 +2308,7 @@ test io-29.7 {Tcl_Flush, full buffering} {testchannel} { set l } {5 0 11 0 0 11} test io-29.8 {Tcl_Flush, full buffering} {testchannel} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -buffering line puts -nonewline $f hello @@ -2268,7 +2331,7 @@ test io-29.9 {Tcl_Flush, channel not writable} { list [catch {flush stdin} msg] $msg } {1 {channel "stdin" wasn't opened for writing}} test io-29.10 {Tcl_WriteChars, looping and buffering} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} set f2 [open $path(longfile) r] @@ -2280,7 +2343,7 @@ test io-29.10 {Tcl_WriteChars, looping and buffering} { file size $path(test1) } 387 test io-29.11 {Tcl_WriteChars, no newline, implicit flush} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -eofchar {} set f2 [open $path(longfile) r] @@ -2291,16 +2354,16 @@ test io-29.11 {Tcl_WriteChars, no newline, implicit flush} { close $f2 file size $path(test1) } 377 -test io-29.12 {Tcl_WriteChars on a pipe} {stdio} { - removeFile test1 - removeFile pipe +test io-29.12 {Tcl_WriteChars on a pipe} {stdio openpipe} { + file delete $path(test1) + file delete $path(pipe) set f1 [open $path(pipe) w] - puts $f1 [format { - set f1 [open "%s" r] + puts $f1 "set f1 \[[list open $path(longfile) r]]" + puts $f1 { for {set x 0} {$x < 10} {incr x} { puts [gets $f1] } - } $path(longfile)] + } close $f1 set f1 [open "|[list [interpreter] $path(pipe)]" r] set f2 [open $path(longfile) r] @@ -2316,9 +2379,9 @@ test io-29.12 {Tcl_WriteChars on a pipe} {stdio} { close $f2 set y } ok -test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} { - removeFile test1 - removeFile pipe +test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio openpipe} { + file delete $path(test1) + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 { puts [gets stdin] @@ -2346,7 +2409,7 @@ test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} { set y } ok test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] puts -nonewline $f "Text1" puts -nonewline $f " Text 2" @@ -2358,7 +2421,7 @@ test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} { set x } {Text1 Text 2 Text 3} test io-29.15 {Tcl_Flush, channel not open for writing} { - removeFile test1 + file delete $path(test1) set fd [open $path(test1) w] close $fd set fd [open $path(test1) r] @@ -2367,7 +2430,7 @@ test io-29.15 {Tcl_Flush, channel not open for writing} { 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} { +test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio openpipe} { set fd [open "|[list [interpreter] cat longfile]" r] set x [list [catch {flush $fd} msg] $msg] catch {close $fd} @@ -2375,7 +2438,7 @@ test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio} { [list 1 "channel \"$fd\" wasn't opened for writing"] } 0 test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf puts $f1 hello @@ -2387,7 +2450,7 @@ test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} { set x } 18 test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} { - removeFile test1 + file delete $path(test1) set x "" set f1 [open $path(test1) w] fconfigure $f1 -translation lf @@ -2406,7 +2469,7 @@ test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} { set x } {18 24 30} test io-29.19 {Explicit and implicit flushes} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} set x "" @@ -2424,7 +2487,7 @@ test io-29.19 {Explicit and implicit flushes} { set x } {18 24 30} test io-29.20 {Implicit flush when buffer is full} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} set line "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" @@ -2441,8 +2504,8 @@ test io-29.20 {Implicit flush when buffer is full} { lappend z [file size $path(test1)] set z } {4096 12288 12600} -test io-29.21 {Tcl_Flush to pipe} {stdio} { - removeFile pipe +test io-29.21 {Tcl_Flush to pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {set x [read stdin 6]} puts $f1 {set cnt [string length $x]} @@ -2455,8 +2518,8 @@ test io-29.21 {Tcl_Flush to pipe} {stdio} { catch {close $f1} set x } "read 6 characters" -test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { - removeFile pipe +test io-29.22 {Tcl_Flush called at other end of pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 { fconfigure stdout -buffering full @@ -2478,8 +2541,8 @@ test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { close $f1 set x } {hello hello bye} -test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { - removeFile pipe +test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 { puts hello @@ -2513,8 +2576,8 @@ test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} { close $f set x } "{} {Line 1\nLine 2}" -test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { - removeFile test3 +test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio openpipe fileevent} { + file delete $path(test3) set f [open "|[list [interpreter] $path(cat) | [interpreter] $path(cat) > $path(test3)]" w] puts $f "Line 1" puts $f "Line 2" @@ -2525,7 +2588,7 @@ test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { close $f set x } "Line 1\nLine 2\n" -test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs} { +test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs openpipe} { set f [open "|[list cat -u]" r+] puts $f "Line1" flush $f @@ -2533,8 +2596,8 @@ test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs close $f set x } {Line1} -test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { - removeFile pipe +test io-29.27 {Tcl_Flush on closed pipeline} {stdio openpipe} { + file delete $path(pipe) set f [open $path(pipe) w] puts $f {exit} close $f @@ -2549,11 +2612,11 @@ test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { # you disable the debugger's signal interception. # if {[catch {flush $f} msg]} { - set x [list 1 $msg $errorCode] + set x [list 1 $msg $::errorCode] catch {close $f} } else { if {[catch {close $f} msg]} { - set x [list 1 $msg $errorCode] + set x [list 1 $msg $::errorCode] } else { set x {this was supposed to fail and did not} } @@ -2562,7 +2625,7 @@ test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { string tolower $x } {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}} test io-29.28 {Tcl_WriteChars, lf mode} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} puts $f hello\nthere\nand\nhere @@ -2572,7 +2635,7 @@ test io-29.28 {Tcl_WriteChars, lf mode} { set s } 21 test io-29.29 {Tcl_WriteChars, cr mode} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} puts $f hello\nthere\nand\nhere @@ -2580,18 +2643,20 @@ test io-29.29 {Tcl_WriteChars, cr mode} { file size $path(test1) } 21 test io-29.30 {Tcl_WriteChars, crlf mode} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} puts $f hello\nthere\nand\nhere close $f file size $path(test1) } 25 -test io-29.31 {Tcl_WriteChars, background flush} {stdio} { - removeFile pipe - removeFile output +test io-29.31 {Tcl_WriteChars, background flush} {stdio openpipe} { + # This test may fail on old Unix systems (seen on IRIX64 6.5) with + # obsolete gettimeofday() calls. See Tcl Bugs 3530533, 1942197. + file delete $path(pipe) + file delete $path(output) set f [open $path(pipe) w] - puts $f [format {set f [open "%s" w]} $path(output)] + puts $f "set f \[[list open $path(output) w]]" puts $f {fconfigure $f -translation lf} set x [list while {![eof stdin]}] set x "$x {" @@ -2613,22 +2678,28 @@ test io-29.31 {Tcl_WriteChars, background flush} {stdio} { close $f set counter 0 while {([file size $path(output)] < 65536) && ($counter < 1000)} { - incr counter - after 5 - update + after 10 [list incr [namespace which -variable counter]] + vwait [namespace which -variable counter] } if {$counter == 1000} { set result "file size only [file size $path(output)]" } else { set result ok } + # allow a little time for the background process to close. + # otherwise, the following test fails on the [file delete $path(output) + # on Windows because a process still has the file open. + after 100 set v 1; vwait v + set result } ok test io-29.32 {Tcl_WriteChars, background flush to slow reader} \ - {stdio asyncPipeClose} { - catch {removeFile pipe} - catch {removeFile output} + {stdio asyncPipeClose openpipe} { + # This test may fail on old Unix systems (seen on IRIX64 6.5) with + # obsolete gettimeofday() calls. See Tcl Bugs 3530533, 1942197. + file delete $path(pipe) + file delete $path(output) set f [open $path(pipe) w] - puts $f [format {set f [open {%s} w]} $path(output)] + puts $f "set f \[[list open $path(output) w]]" puts $f {fconfigure $f -translation lf} set x [list while {![eof stdin]}] set x "$x \{" @@ -2651,9 +2722,8 @@ test io-29.32 {Tcl_WriteChars, background flush to slow reader} \ close $f set counter 0 while {([file size $path(output)] < 65536) && ($counter < 1000)} { - incr counter - after 20 - update + after 20 [list incr [namespace which -variable counter]] + vwait [namespace which -variable counter] } if {$counter == 1000} { set result "file size only [file size $path(output)]" @@ -2663,13 +2733,12 @@ test io-29.32 {Tcl_WriteChars, background flush to slow reader} \ } ok 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 "set f \[[list open $path(test1) w]]" + puts $f {fconfigure $f -translation lf puts $f hello puts $f bye puts $f strange - } $path(test1)] + } close $f exec [interpreter] $path(script) set f [open $path(test1) r] @@ -2677,8 +2746,28 @@ test io-29.33 {Tcl_Flush, implicit flush on exit} {exec} { 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 path(script2) [makeFile {} script2] +test io-29.33b {TIP#398, no implicit flush of nonblocking on exit} {exec} { + set f [open $path(script) w] + puts $f { + fconfigure stdout -blocking 0 + puts -nonewline stdout [string repeat A 655360] + flush stdout + } + close $f + set f [open $path(script2) w] + puts $f {after 2000} + close $f + set t1 [clock milliseconds] + set ff [open "|[list [interpreter] $path(script2)]" w] + catch {unset ::env(TCL_FLUSH_NONBLOCKING_ON_EXIT)} + exec [interpreter] $path(script) >@ $ff + set t2 [clock milliseconds] + close $ff + expr {($t2-$t1)/2000 ? $t2-$t1 : 0} +} 0 +test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac fileevent} { + variable c 0 variable x running set l abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz proc writelots {s l} { @@ -2696,7 +2785,7 @@ test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMa variable c variable x set l [gets $s] - + if {[eof $s]} { close $s set x done @@ -2704,8 +2793,8 @@ test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMa incr c } } - set ss [socket -server [namespace code accept] 0] - set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + set ss [socket -server [namespace code accept] -myaddr 127.0.0.1 0] + set cs [socket 127.0.0.1 [lindex [fconfigure $ss -sockname] 2]] vwait [namespace which -variable x] fconfigure $cs -blocking off writelots $cs $l @@ -2714,20 +2803,20 @@ test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMa vwait [namespace which -variable x] set c } 2000 -test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotMac} { - # On Mac, this test screws up sockets such that subsequent tests using port 2828 +test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotMac fileevent} { + # On Mac, this test screws up sockets such that subsequent tests using port 2828 # either cause errors or panic(). - + catch {interp delete x} catch {interp delete y} interp create x interp create y - set s [socket -server [namespace code accept] 0] + set s [socket -server [namespace code accept] -myaddr 127.0.0.1 0] proc accept {s a p} { puts $s hello close $s } - set c [socket [info hostname] [lindex [fconfigure $s -sockname] 2]] + set c [socket 127.0.0.1 [lindex [fconfigure $s -sockname] 2]] interp share {} $c x interp share {} $c y close $c @@ -2759,7 +2848,7 @@ test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotM # Test end of line translations. Procedures tested are Tcl_Write, Tcl_Read. test io-30.1 {Tcl_Write lf, Tcl_Read lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -2771,7 +2860,7 @@ test io-30.1 {Tcl_Write lf, Tcl_Read lf} { set x } "hello\nthere\nand\nhere\n" test io-30.2 {Tcl_Write lf, Tcl_Read cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -2783,7 +2872,7 @@ test io-30.2 {Tcl_Write lf, Tcl_Read cr} { set x } "hello\nthere\nand\nhere\n" test io-30.3 {Tcl_Write lf, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -2795,7 +2884,7 @@ test io-30.3 {Tcl_Write lf, Tcl_Read crlf} { set x } "hello\nthere\nand\nhere\n" test io-30.4 {Tcl_Write cr, Tcl_Read cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -2807,7 +2896,7 @@ test io-30.4 {Tcl_Write cr, Tcl_Read cr} { set x } "hello\nthere\nand\nhere\n" test io-30.5 {Tcl_Write cr, Tcl_Read lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -2819,7 +2908,7 @@ test io-30.5 {Tcl_Write cr, Tcl_Read lf} { set x } "hello\rthere\rand\rhere\r" test io-30.6 {Tcl_Write cr, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -2831,7 +2920,7 @@ test io-30.6 {Tcl_Write cr, Tcl_Read crlf} { set x } "hello\rthere\rand\rhere\r" test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -2843,7 +2932,7 @@ test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} { set x } "hello\nthere\nand\nhere\n" test io-30.8 {Tcl_Write crlf, Tcl_Read lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -2855,7 +2944,7 @@ test io-30.8 {Tcl_Write crlf, Tcl_Read lf} { set x } "hello\r\nthere\r\nand\r\nhere\r\n" test io-30.9 {Tcl_Write crlf, Tcl_Read cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -2867,7 +2956,7 @@ test io-30.9 {Tcl_Write crlf, Tcl_Read cr} { set x } "hello\n\nthere\n\nand\n\nhere\n\n" test io-30.10 {Tcl_Write lf, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -2883,7 +2972,7 @@ and here } auto} test io-30.11 {Tcl_Write cr, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -2899,7 +2988,7 @@ and here } auto} test io-30.12 {Tcl_Write crlf, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -2914,9 +3003,8 @@ there and here } auto} - test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf @@ -2931,9 +3019,8 @@ test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { close $f string length $c } [expr 700*15+1] - test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf @@ -2948,9 +3035,8 @@ test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { close $f string length $c } [expr 700*15+1] - test io-30.15 {Tcl_Write mixed, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\rhere @@ -2966,7 +3052,7 @@ and here } test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f hello\nthere\nand\rhere\n\x1a @@ -2981,8 +3067,8 @@ there and here } -test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} { - removeFile test1 +test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {win} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -eofchar \x1a -translation lf puts $f hello\nthere\nand\rhere @@ -2998,7 +3084,7 @@ and here } test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cghi\nqrs" 26] @@ -3018,7 +3104,7 @@ test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { set l } {abc def 0 {} 1 {} 1} test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cghi\nqrs" 26] @@ -3038,7 +3124,7 @@ test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { set l } {abc def 0 {} 1 {} 1} test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set s [format "abc\ndef\n%cghi\nqrs" 26] @@ -3060,7 +3146,7 @@ test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { set l } "abc def 0 \x1aghi 0 qrs 0 {} 1" test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set s [format "abc\ndef\n%cghi\nqrs" 26] @@ -3078,7 +3164,7 @@ test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { set l } {0 1 {} 1} test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set s [format "abc\ndef\n%cghi\nqrs" 26] @@ -3096,7 +3182,7 @@ test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { set l } {0 1 {} 1} test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3110,7 +3196,7 @@ test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { list $c $e } {8 1} test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3124,7 +3210,7 @@ test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { list $c $e } {8 1} test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3138,7 +3224,7 @@ test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { list $c $e } {8 1} test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3152,7 +3238,7 @@ test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { list $c $e } {8 1} test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3166,7 +3252,7 @@ test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { list $c $e } {8 1} test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format abc\ndef\n%cqrs\ntuv 26] @@ -3183,7 +3269,7 @@ test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { # Test end of line translations. Functions tested are Tcl_Write and Tcl_Gets. test io-31.1 {Tcl_Write lf, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -3200,7 +3286,7 @@ test io-31.1 {Tcl_Write lf, Tcl_Gets auto} { set l } {hello 6 auto there 12 auto} test io-31.2 {Tcl_Write cr, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -3217,7 +3303,7 @@ test io-31.2 {Tcl_Write cr, Tcl_Gets auto} { set l } {hello 6 auto there 12 auto} test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -3234,7 +3320,7 @@ test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} { set l } {hello 7 auto there 14 auto} test io-31.4 {Tcl_Write lf, Tcl_Gets lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -3252,7 +3338,7 @@ test io-31.4 {Tcl_Write lf, Tcl_Gets lf} { set l } {hello 6 lf there 12 lf} test io-31.5 {Tcl_Write lf, Tcl_Gets cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -3272,7 +3358,7 @@ test io-31.5 {Tcl_Write lf, Tcl_Gets cr} { set l } {21 21 cr 1 {} 21 cr 1} test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\nand\nhere @@ -3292,7 +3378,7 @@ test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} { set l } {21 21 crlf 1 {} 21 crlf 1} test io-31.7 {Tcl_Write cr, Tcl_Gets cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -3312,7 +3398,7 @@ test io-31.7 {Tcl_Write cr, Tcl_Gets cr} { set l } {hello 6 cr 0 there 12 cr 0} test io-31.8 {Tcl_Write cr, Tcl_Gets lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -3332,7 +3418,7 @@ test io-31.8 {Tcl_Write cr, Tcl_Gets lf} { set l } {21 21 lf 1 {} 21 lf 1} test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr puts $f hello\nthere\nand\nhere @@ -3352,7 +3438,7 @@ test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} { set l } {21 21 crlf 1 {} 21 crlf 1} test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -3372,7 +3458,7 @@ test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} { set l } {hello 7 crlf 0 there 14 crlf 0} test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -3392,7 +3478,7 @@ test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} { set l } {hello 6 cr 0 6 13 cr 0} test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf puts $f hello\nthere\nand\nhere @@ -3412,7 +3498,7 @@ test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} { set l } {6 7 lf 0 6 14 lf 0} test io-31.13 {binary mode is synonym of lf mode} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation binary set x [fconfigure $f -translation] @@ -3424,7 +3510,7 @@ test io-31.13 {binary mode is synonym of lf mode} { # not supoprted. # test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts $f hello\nthere\rand\r\nhere @@ -3443,7 +3529,7 @@ test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f hello\nthere\rand\r\nhere\r @@ -3462,7 +3548,7 @@ test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f hello\nthere\rand\r\nhere\n @@ -3480,7 +3566,7 @@ test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f hello\nthere\rand\r\nhere\r\n @@ -3499,7 +3585,7 @@ test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "hello\nthere\nand\rhere\n\%c" 26] @@ -3519,7 +3605,7 @@ test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -eofchar \x1a -translation lf puts $f hello\nthere\nand\rhere @@ -3538,7 +3624,7 @@ test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { set l } {hello there and here 0 {} 1} test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3557,7 +3643,7 @@ test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { set l } {abc def 0 {} 1} test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3575,7 +3661,7 @@ test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { set l } {abc def 0 {} 1} test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3597,7 +3683,7 @@ test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3619,7 +3705,7 @@ test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3641,7 +3727,7 @@ test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3659,7 +3745,7 @@ test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { set l } {abc def 0 {} 1} test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3677,7 +3763,7 @@ test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { set l } {abc def 0 {} 1} test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3695,7 +3781,7 @@ test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { set l } {abc def 0 {} 1} test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3713,7 +3799,7 @@ test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { set l } {abc def 0 {} 1} test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3731,7 +3817,7 @@ test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { set l } {abc def 0 {} 1} test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} set s [format "abc\ndef\n%cqrs\ntuv" 26] @@ -3749,7 +3835,7 @@ test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { set l } {abc def 0 {} 1} test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf @@ -3768,7 +3854,7 @@ test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} { string length $c } [expr 700*15+1] test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf @@ -3787,7 +3873,6 @@ test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { string length $c } [expr 700*15+1] - # Test Tcl_Read and buffering. test io-32.1 {Tcl_Read, channel not readable} { @@ -3801,7 +3886,7 @@ test io-32.3 {Tcl_Read, negative byte count} { set l [list [catch {read $f -1} msg] $msg] close $f set l -} {1 {bad argument "-1": should be "nonewline"}} +} {1 {expected non-negative integer but got "-1"}} test io-32.4 {Tcl_Read, positive byte count} { set f [open $path(longfile) r] set x [read $f 1024] @@ -3868,8 +3953,8 @@ test io-32.9 {Tcl_Read, read to end of file} { } set x } ok -test io-32.10 {Tcl_Read from a pipe} {stdio} { - removeFile pipe +test io-32.10 {Tcl_Read from a pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} close $f1 @@ -3880,8 +3965,8 @@ test io-32.10 {Tcl_Read from a pipe} {stdio} { close $f1 set x } "hello\n" -test io-32.11 {Tcl_Read from a pipe} {stdio} { - removeFile pipe +test io-32.11 {Tcl_Read from a pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} puts $f1 {puts [gets stdin]} @@ -3900,7 +3985,7 @@ test io-32.11 {Tcl_Read from a pipe} {stdio} { } {hello }} test io-32.12 {Tcl_Read, -nonewline} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] puts $f1 hello puts $f1 bye @@ -3912,7 +3997,7 @@ test io-32.12 {Tcl_Read, -nonewline} { } {hello bye} test io-32.13 {Tcl_Read, -nonewline} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] puts $f1 hello puts $f1 bye @@ -3924,7 +4009,7 @@ test io-32.13 {Tcl_Read, -nonewline} { } {9 {hello bye}} test io-32.14 {Tcl_Read, reading in small chunks} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" @@ -3937,7 +4022,7 @@ test io-32.14 {Tcl_Read, reading in small chunks} { and this one }} test io-32.15 {Tcl_Read, asking for more input than available} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" @@ -3950,7 +4035,7 @@ test io-32.15 {Tcl_Read, asking for more input than available} { and this one } test io-32.16 {Tcl_Read, read to end of file with -nonewline} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f "Two lines: this one" puts $f "and this one" @@ -3965,7 +4050,7 @@ and this one} # Test Tcl_Gets. test io-33.1 {Tcl_Gets, reading what was written} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set y "first line" puts $f1 $y @@ -3990,8 +4075,8 @@ test io-33.2 {Tcl_Gets into variable} { close $f1 set z } ok -test io-33.3 {Tcl_Gets from pipe} {stdio} { - removeFile pipe +test io-33.3 {Tcl_Gets from pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {puts [gets stdin]} close $f1 @@ -4007,7 +4092,7 @@ test io-33.3 {Tcl_Gets from pipe} {stdio} { set z } ok test io-33.4 {Tcl_Gets with long line} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -4027,7 +4112,7 @@ test io-33.5 {Tcl_Gets with long line} { list $x $y } {260 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} test io-33.6 {Tcl_Gets and end of file} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] puts -nonewline $f "Test1\nTest2" close $f @@ -4104,7 +4189,7 @@ test io-34.1 {Tcl_Seek to current position at start of file} { set c } 0 test io-34.2 {Tcl_Seek to offset from start} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4117,7 +4202,7 @@ test io-34.2 {Tcl_Seek to offset from start} { set c } 10 test io-34.3 {Tcl_Seek to end of file} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4130,7 +4215,7 @@ test io-34.3 {Tcl_Seek to end of file} { set c } 54 test io-34.4 {Tcl_Seek to offset from end of file} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4143,7 +4228,7 @@ test io-34.4 {Tcl_Seek to offset from end of file} { set c } 44 test io-34.5 {Tcl_Seek to offset from current position} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4157,7 +4242,7 @@ test io-34.5 {Tcl_Seek to offset from current position} { set c } 20 test io-34.6 {Tcl_Seek to offset from end of file} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4172,7 +4257,7 @@ test io-34.6 {Tcl_Seek to offset from end of file} { } {44 {rstuvwxyz }} test io-34.7 {Tcl_Seek to offset from end of file, then to current position} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4187,7 +4272,7 @@ test io-34.7 {Tcl_Seek to offset from end of file, then to current position} { close $f1 list $c1 $r1 $c2 } {44 rstuv 49} -test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} { +test io-34.8 {Tcl_Seek on pipes: not supported} {stdio openpipe} { set f1 [open "|[list [interpreter]]" r+] set x [list [catch {seek $f1 0 current} msg] $msg] close $f1 @@ -4195,7 +4280,7 @@ test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} { string tolower $x } {1 {error during seek on "": invalid argument}} test io-34.9 {Tcl_Seek, testing buffered input flushing} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] fconfigure $f -eofchar {} puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -4217,9 +4302,7 @@ 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 $path(test3) w] fconfigure $f -translation lf @@ -4263,14 +4346,14 @@ test io-34.12 {Tcl_Seek testing combination of write, seek back and read} { 123 xyzzy} zzy} test io-34.13 {Tcl_Tell at start of file} { - removeFile test1 + file delete $path(test1) 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 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4283,7 +4366,7 @@ test io-34.14 {Tcl_Tell after seek to end of file} { set c1 } 54 test io-34.15 {Tcl_Tell combined with seeking} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -eofchar {} puts $f1 "abcdefghijklmnopqrstuvwxyz" @@ -4297,13 +4380,13 @@ test io-34.15 {Tcl_Tell combined with seeking} { close $f1 list $c1 $c2 } {10 20} -test io-34.16 {Tcl_tell on pipe: always -1} {stdio} { +test io-34.16 {Tcl_Tell on pipe: always -1} {stdio openpipe} { 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} { +test io-34.17 {Tcl_Tell on pipe: always -1} {stdio openpipe} { set f1 [open "|[list [interpreter]]" r+] puts $f1 {puts hello} flush $f1 @@ -4313,7 +4396,7 @@ test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} { set c } -1 test io-34.18 {Tcl_Tell combined with seeking and reading} { - removeFile test2 + file delete $path(test2) set f [open $path(test2) w] fconfigure $f -translation lf -eofchar {} puts -nonewline $f "line1\nline2\nline3\nline4\nline5\n" @@ -4359,7 +4442,7 @@ test io-34.20 {Tcl_Tell combined with writing} { set l } {29 39 40 447} test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] fconfigure $f -encoding binary set l "" @@ -4384,7 +4467,7 @@ test io-34.21 {Tcl_Seek and Tcl_Tell on large files} {largefileSupport} { # Test Tcl_Eof test io-35.1 {Tcl_Eof} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f hello puts $f hello @@ -4402,8 +4485,8 @@ test io-35.1 {Tcl_Eof} { close $f set x } {0 0 0 0 1 1} -test io-35.2 {Tcl_Eof with pipe} {stdio} { - removeFile pipe +test io-35.2 {Tcl_Eof with pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {gets stdin} puts $f1 {puts hello} @@ -4420,8 +4503,8 @@ test io-35.2 {Tcl_Eof with pipe} {stdio} { close $f1 set x } {0 0 0 1} -test io-35.3 {Tcl_Eof with pipe} {stdio} { - removeFile pipe +test io-35.3 {Tcl_Eof with pipe} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 {gets stdin} puts $f1 {puts hello} @@ -4443,7 +4526,7 @@ test io-35.3 {Tcl_Eof with pipe} {stdio} { set x } {0 0 0 1 1 1} test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -4454,8 +4537,8 @@ test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { close $f set l } {{} 1} -test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { - removeFile pipe +test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio openpipe} { + file delete $path(pipe) set f [open $path(pipe) w] puts $f { exit @@ -4469,7 +4552,7 @@ test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { set l } {{} 1} test io-35.6 {Tcl_Eof, eof char, lf write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar \x1a puts $f abc\ndef @@ -4483,7 +4566,7 @@ test io-35.6 {Tcl_Eof, eof char, lf write, auto read} { list $s $l $e } {9 8 1} test io-35.7 {Tcl_Eof, eof char, lf write, lf read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar \x1a puts $f abc\ndef @@ -4497,7 +4580,7 @@ test io-35.7 {Tcl_Eof, eof char, lf write, lf read} { list $s $l $e } {9 8 1} test io-35.8 {Tcl_Eof, eof char, cr write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar \x1a puts $f abc\ndef @@ -4511,7 +4594,7 @@ test io-35.8 {Tcl_Eof, eof char, cr write, auto read} { list $s $l $e } {9 8 1} test io-35.9 {Tcl_Eof, eof char, cr write, cr read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar \x1a puts $f abc\ndef @@ -4525,7 +4608,7 @@ test io-35.9 {Tcl_Eof, eof char, cr write, cr read} { list $s $l $e } {9 8 1} test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar \x1a puts $f abc\ndef @@ -4539,7 +4622,7 @@ test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} { list $s $l $e } {11 8 1} test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar \x1a puts $f abc\ndef @@ -4553,7 +4636,7 @@ test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} { list $s $l $e } {11 8 1} test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4568,7 +4651,7 @@ test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} { list $c $l $e } {17 8 1} test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4583,7 +4666,7 @@ test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} { list $c $l $e } {17 8 1} test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4598,7 +4681,7 @@ test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} { list $c $l $e } {17 8 1} test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4613,7 +4696,7 @@ test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} { list $c $l $e } {17 8 1} test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4628,7 +4711,7 @@ test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { list $c $l $e } {21 8 1} test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf -eofchar {} set i [format abc\ndef\n%cqrs\nuvw 26] @@ -4642,10 +4725,81 @@ test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { close $f list $c $l $e } {21 8 1} +test io-35.18 {Tcl_Eof, eof char, cr write, crlf read} -body { + file delete $path(test1) + set f [open $path(test1) w] + fconfigure $f -translation cr + puts $f abc\ndef + close $f + set s [file size $path(test1)] + set f [open $path(test1) r] + fconfigure $f -translation crlf + set l [string length [set in [read $f]]] + set e [eof $f] + close $f + list $s $l $e [scan [string index $in end] %c] +} -result {8 8 1 13} +test io-35.18a {Tcl_Eof, eof char, cr write, crlf read} -body { + file delete $path(test1) + set f [open $path(test1) w] + fconfigure $f -translation cr -eofchar \x1a + puts $f abc\ndef + close $f + set s [file size $path(test1)] + set f [open $path(test1) r] + fconfigure $f -translation crlf -eofchar \x1a + set l [string length [set in [read $f]]] + set e [eof $f] + close $f + list $s $l $e [scan [string index $in end] %c] +} -result {9 8 1 13} +test io-35.18b {Tcl_Eof, eof char, cr write, crlf read} -constraints knownBug -body { + file delete $path(test1) + set f [open $path(test1) w] + fconfigure $f -translation cr -eofchar \x1a + puts $f {} + close $f + set s [file size $path(test1)] + set f [open $path(test1) r] + fconfigure $f -translation crlf -eofchar \x1a + set l [string length [set in [read $f]]] + set e [eof $f] + close $f + list $s $l $e [scan [string index $in end] %c] +} -result {2 1 1 13} +test io-35.18c {Tcl_Eof, eof char, cr write, crlf read} -body { + file delete $path(test1) + set f [open $path(test1) w] + fconfigure $f -translation cr + puts $f {} + close $f + set s [file size $path(test1)] + set f [open $path(test1) r] + fconfigure $f -translation crlf + set l [string length [set in [read $f]]] + set e [eof $f] + close $f + list $s $l $e [scan [string index $in end] %c] +} -result {1 1 1 13} +test io-35.19 {Tcl_Eof, eof char in middle, cr write, crlf read} -body { + file delete $path(test1) + 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 $path(test1)] + set f [open $path(test1) r] + fconfigure $f -translation crlf -eofchar \x1a + set l [string length [set in [read $f]]] + set e [eof $f] + close $f + list $c $l $e [scan [string index $in end] %c] +} -result {17 8 1 13} # Test Tcl_InputBlocked -test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} { +test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio openpipe} { set f1 [open "|[list [interpreter]]" r+] puts $f1 {puts hello_from_pipe} flush $f1 @@ -4664,7 +4818,7 @@ test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} { close $f1 set x } {{} 1 hello 0 {} 1} -test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} { +test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio openpipe} { set f1 [open "|[list [interpreter]]" r+] fconfigure $f1 -buffering line puts $f1 {puts hello_from_pipe} @@ -4679,7 +4833,7 @@ test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} { set x } {hello_from_pipe 0 {} 0 1} test io-36.3 {Tcl_InputBlocked vs files, short read} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f abcdefghijklmnop close $f @@ -4694,14 +4848,14 @@ test io-36.3 {Tcl_InputBlocked vs files, short read} { close $f set l } {0 abc 0 defghijklmnop 0 1} -test io-36.4 {Tcl_InputBlocked vs files, event driven read} { +test io-36.4 {Tcl_InputBlocked vs files, event driven read} {fileevent} { proc in {f} { variable l variable x lappend l [read $f 3] if {[eof $f]} {lappend l eof; close $f; set x done} } - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f abcdefghijklmnop close $f @@ -4714,7 +4868,7 @@ test io-36.4 {Tcl_InputBlocked vs files, event driven read} { } {abc def ghi jkl mno {p } eof} test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f abcdefghijklmnop close $f @@ -4730,14 +4884,14 @@ test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles close $f set l } {0 abc 0 defghijklmnop 0 1} -test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} { +test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles fileevent} { proc in {f} { variable l variable x lappend l [read $f 3] if {[eof $f]} {lappend l eof; close $f; set x done} } - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] puts $f abcdefghijklmnop close $f @@ -4803,8 +4957,7 @@ test io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} { lappend l [fconfigure $f -buffersize] close $f set l -} {4096 10000 4096 4096 4096 100000 4096} - +} {4096 10000 1 1 1 100000 1048576} test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} { # This test crashes the interp if Bug #427196 is not fixed @@ -4819,7 +4972,7 @@ test io-38.3 {Tcl_SetChannelBufferSize, changing buffersize between reads} { # Test Tcl_SetChannelOption, Tcl_GetChannelOption test io-39.1 {Tcl_GetChannelOption} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set x [fconfigure $f1 -blocking] close $f1 @@ -4829,14 +4982,14 @@ test io-39.1 {Tcl_GetChannelOption} { # Test 17.2 was removed. # test io-39.2 {Tcl_GetChannelOption} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set x [fconfigure $f1 -buffering] close $f1 set x } full test io-39.3 {Tcl_GetChannelOption} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -buffering line set x [fconfigure $f1 -buffering] @@ -4844,7 +4997,7 @@ test io-39.3 {Tcl_GetChannelOption} { set x } line test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set l "" lappend l [fconfigure $f1 -buffering] @@ -4860,7 +5013,7 @@ test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { set l } {full line none line full} test io-39.5 {Tcl_GetChannelOption, invariance} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set l "" lappend l [fconfigure $f1 -buffering] @@ -4870,7 +5023,7 @@ test io-39.5 {Tcl_GetChannelOption, invariance} { set l } {full {1 {bad value for -buffering: must be one of full, line, or none}} full} test io-39.6 {Tcl_SetChannelOption, multiple options} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf -buffering line puts $f1 hello @@ -4880,7 +5033,7 @@ test io-39.6 {Tcl_SetChannelOption, multiple options} { set x } 10 test io-39.7 {Tcl_SetChannelOption, buffering, translation} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] fconfigure $f1 -translation lf puts $f1 hello @@ -4894,7 +5047,7 @@ test io-39.7 {Tcl_SetChannelOption, buffering, translation} { set x } {0 21} test io-39.8 {Tcl_SetChannelOption, different buffering options} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] set l "" fconfigure $f1 -translation lf -buffering none -eofchar {} @@ -4914,7 +5067,7 @@ test io-39.8 {Tcl_SetChannelOption, different buffering options} { set l } {5 10 10 10 20 20} test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w] close $f1 set f1 [open $path(test1) r] @@ -4929,8 +5082,8 @@ test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { close $f1 set x } {1 0 {} {} 0 1} -test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { - removeFile pipe +test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio openpipe} { + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 { gets stdin @@ -4965,24 +5118,24 @@ test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { close $f1 set x } {0 {} 1 {} 1 {} 1 1 hi 0 0 {} 1} -test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { - removeFile test1 +test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size clipped to lower bound} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -buffersize -10 set x [fconfigure $f -buffersize] close $f set x -} 4096 -test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { - removeFile test1 +} 1 +test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size clipped to upper bound} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -buffersize 10000000 set x [fconfigure $f -buffersize] close $f set x -} 4096 +} 1048576 test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -buffersize 40000 set x [fconfigure $f -buffersize] @@ -4990,7 +5143,7 @@ test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { set x } 40000 test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -encoding {} puts -nonewline $f \xe7\x89\xa6 @@ -5002,7 +5155,7 @@ test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} { set x } \u7266 test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -encoding binary puts -nonewline $f \xe7\x89\xa6 @@ -5014,13 +5167,13 @@ test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} { set x } \u7266 test io-39.16 {Tcl_SetChannelOption: -encoding, errors} { - removeFile test1 + file delete $path(test1) 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} { +test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio openpipe fileevent} { set f [open "|[list [interpreter] $path(cat)]" r+] fconfigure $f -encoding binary puts -nonewline $f "\xe7" @@ -5042,11 +5195,10 @@ test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} close $f set x } "{} timeout {} timeout \xe7 timeout" - test io-39.18 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} - set s1 [socket -server [namespace code accept] 0] + set s1 [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -5059,7 +5211,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 [namespace code accept] 0] + set s1 [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -5072,7 +5224,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 [namespace code accept] 0] + set s1 [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -5085,7 +5237,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 [namespace code accept] 0] + set s1 [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set port [lindex [fconfigure $s1 -sockname] 2] set s2 [socket 127.0.0.1 $port] update @@ -5095,9 +5247,8 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \ close $s2 set modes } {auto crlf} - -test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} { - removeFile test1 +test io-39.22 {Tcl_SetChannelOption, invariance} {unix} { + file delete $path(test1) set f1 [open $path(test1) w+] set l "" lappend l [fconfigure $f1 -eofchar] @@ -5108,9 +5259,8 @@ test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} { close $f1 set l } {{{} {}} {O G} {D D}} - test io-39.22a {Tcl_SetChannelOption, invariance} { - removeFile test1 + file delete $path(test1) set f1 [open $path(test1) w+] set l [list] fconfigure $f1 -eofchar {ON GO} @@ -5121,12 +5271,10 @@ test io-39.22a {Tcl_SetChannelOption, invariance} { 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] + set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0] lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation] close $sock set l @@ -5134,7 +5282,7 @@ test io-39.23 {Tcl_GetChannelOption, server socket is not readable or 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] + set sock [socket -server [namespace code accept] -myaddr 127.0.0.1 0] fconfigure $sock -eofchar D -translation lf lappend l [fconfigure $sock -eofchar] [fconfigure $sock -translation] close $sock @@ -5142,7 +5290,7 @@ test io-39.24 {Tcl_SetChannelOption, server socket is not readable or } {{{}} auto} test io-40.1 {POSIX open access modes: RDWR} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] puts $f xyzzy close $f @@ -5156,33 +5304,28 @@ test io-40.1 {POSIX open access modes: RDWR} { close $f set x } {zzy abzzy} -test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { - removeFile test3 - set f [open $path(test3) {WRONLY CREAT} 0600] +test io-40.2 {POSIX open access modes: CREAT} {unix} { + file delete $path(test3) + set f [open $path(test3) {WRONLY CREAT} 0o600] file stat $path(test3) stats - set x [format "0%o" [expr $stats(mode)&0777]] + set x [format "0o%o" [expr $stats(mode)&0o777]] puts $f "line 1" close $f set f [open $path(test3) r] lappend x [gets $f] close $f set x -} {0600 {line 1}} - -# some tests can only be run is umask is 2 -# if "umask" cannot be run, the tests will be skipped. -catch {testConstraint umask2 [expr {[exec umask] == 2}]} - -test io-40.3 {POSIX open access modes: CREAT} {unixOnly umask2} { +} {0o600 {line 1}} +test io-40.3 {POSIX open access modes: CREAT} {unix umask} { # This test only works if your umask is 2, like ouster's. - removeFile test3 + file delete $path(test3) set f [open $path(test3) {WRONLY CREAT}] close $f - file stat test3 stats - format "0%o" [expr $stats(mode)&0777] -} 0664 + file stat $path(test3) stats + format "0%o" [expr $stats(mode)&0o777] +} [format %04o [expr {0o666 & ~ $umaskValue}]] test io-40.4 {POSIX open access modes: CREAT} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] fconfigure $f -eofchar {} puts $f xyzzy @@ -5197,7 +5340,7 @@ test io-40.4 {POSIX open access modes: CREAT} { set x } abzzy test io-40.5 {POSIX open access modes: APPEND} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] fconfigure $f -translation lf -eofchar {} puts $f xyzzy @@ -5217,18 +5360,15 @@ test io-40.5 {POSIX open access modes: APPEND} { close $f set x } {{new line} abc} -test io-40.6 {POSIX open access modes: EXCL} { - removeFile test3 +test io-40.6 {POSIX open access modes: EXCL} -match regexp -body { + file delete $path(test3) set f [open $path(test3) w] puts $f xyzzy close $f - 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}} + open $path(test3) {WRONLY CREAT EXCL} +} -returnCodes error -result {(?i)couldn't open ".*test3": file (already )?exists} test io-40.7 {POSIX open access modes: EXCL} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) {WRONLY CREAT EXCL}] fconfigure $f -eofchar {} puts $f "A test line" @@ -5236,7 +5376,7 @@ test io-40.7 {POSIX open access modes: EXCL} { viewFile test3 } {A test line} test io-40.8 {POSIX open access modes: TRUNC} { - removeFile test3 + file delete $path(test3) set f [open $path(test3) w] puts $f xyzzy close $f @@ -5248,8 +5388,8 @@ test io-40.8 {POSIX open access modes: TRUNC} { close $f set x } abc -test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} { - removeFile test3 +test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable unix} { + file delete $path(test3) set f [open $path(test3) {WRONLY NONBLOCK CREAT}] puts $f "NONBLOCK test" close $f @@ -5270,18 +5410,14 @@ test io-40.10 {POSIX open access modes: RDONLY} { [list {two lines: this one} 1 \ [format "channel \"%s\" wasn't opened for writing" $f]] } 0 -test io-40.11 {POSIX open access modes: RDONLY} { - removeFile test3 - 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 - 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.11 {POSIX open access modes: RDONLY} -match regexp -body { + file delete $path(test3) + open $path(test3) RDONLY +} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory} +test io-40.12 {POSIX open access modes: WRONLY} -match regexp -body { + file delete $path(test3) + open $path(test3) WRONLY +} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory} test io-40.13 {POSIX open access modes: WRONLY} { makeFile xyzzy test3 set f [open $path(test3) WRONLY] @@ -5294,12 +5430,10 @@ test io-40.13 {POSIX open access modes: WRONLY} { string compare [string tolower $x] \ [list 1 "channel \"$f\" wasn't opened for reading" abzzy] } 0 -test io-40.14 {POSIX open access modes: RDWR} { - removeFile test3 - 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.14 {POSIX open access modes: RDWR} -match regexp -body { + file delete $path(test3) + open $path(test3) RDWR +} -returnCodes error -result {(?i)couldn't open ".*test3": no such file or directory} test io-40.15 {POSIX open access modes: RDWR} { makeFile xyzzy test3 set f [open $path(test3) RDWR] @@ -5309,37 +5443,34 @@ test io-40.15 {POSIX open access modes: RDWR} { close $f lappend x [viewFile test3] } {zzy abzzy} -if {![file exists ~/_test_] && [file writable ~]} { - test io-40.16 {tilde substitution in open} { - set f [open ~/_test_ w] - puts $f "Some text" - close $f - set x [file exists [file join $env(HOME) _test_]] - removeFile [file join $env(HOME) _test_] - set x - } 1 -} +test io-40.16 {tilde substitution in open} -constraints makeFileInHome -setup { + makeFile {Some text} _test_ ~ +} -body { + file exists [file join $::env(HOME) _test_] +} -cleanup { + removeFile _test_ ~ +} -result 1 test io-40.17 {tilde substitution in open} { - set home $env(HOME) - unset env(HOME) + set home $::env(HOME) + unset ::env(HOME) set x [list [catch {open ~/foo} msg] $msg] - set env(HOME) $home + set ::env(HOME) $home set x } {1 {couldn't find HOME environment variable to expand path}} -test io-41.1 {Tcl_FileeventCmd: errors} { +test io-41.1 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent foo} msg] $msg } {1 {wrong # args: should be "fileevent channelId event ?script?"}} -test io-41.2 {Tcl_FileeventCmd: errors} { +test io-41.2 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent foo bar baz q} msg] $msg } {1 {wrong # args: should be "fileevent channelId event ?script?"}} -test io-41.3 {Tcl_FileeventCmd: errors} { +test io-41.3 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent gorp readable} msg] $msg } {1 {can not find channel named "gorp"}} -test io-41.4 {Tcl_FileeventCmd: errors} { +test io-41.4 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent gorp writable} msg] $msg } {1 {can not find channel named "gorp"}} -test io-41.5 {Tcl_FileeventCmd: errors} { +test io-41.5 {Tcl_FileeventCmd: errors} {fileevent} { list [catch {fileevent gorp who-knows} msg] $msg } {1 {bad event name "who-knows": must be readable or writable}} @@ -5350,10 +5481,10 @@ test io-41.5 {Tcl_FileeventCmd: errors} { set path(foo) [makeFile {} foo] set f [open $path(foo) w+] -test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} { +test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} {fileevent} { list [fileevent $f readable] [fileevent $f writable] } {{} {}} -test io-42.2 {Tcl_FileeventCmd: replacing} { +test io-42.2 {Tcl_FileeventCmd: replacing} {fileevent} { set result {} fileevent $f r "first script" lappend result [fileevent $f readable] @@ -5364,7 +5495,7 @@ test io-42.2 {Tcl_FileeventCmd: replacing} { fileevent $f r "" lappend result [fileevent $f readable] } {{first script} {new script} {yet another} {}} -test io-42.3 {Tcl_FileeventCmd: replacing, with NULL chars in script} { +test io-42.3 {Tcl_FileeventCmd: replacing, with NULL chars in script} {fileevent} { set result {} fileevent $f r "first scr\0ipt" lappend result [string length [fileevent $f readable]] @@ -5376,14 +5507,8 @@ test io-42.3 {Tcl_FileeventCmd: replacing, with NULL chars in script} { lappend result [fileevent $f readable] } {13 11 12 {}} -# -# Test fileevent on a pipe -# -catch {set f2 [open "|[list cat -u]" r+]} -catch {set f3 [open "|[list cat -u]" r+]} - -test io-43.1 {Tcl_FileeventCmd: creating, deleting, querying} {stdio unixExecs} { +test io-43.1 {Tcl_FileeventCmd: creating, deleting, querying} {stdio unixExecs fileevent} { set result {} fileevent $f readable "script 1" lappend result [fileevent $f readable] [fileevent $f writable] @@ -5394,7 +5519,10 @@ test io-43.1 {Tcl_FileeventCmd: creating, deleting, querying} {stdio unixExecs} fileevent $f writable {} lappend result [fileevent $f readable] [fileevent $f writable] } {{script 1} {} {script 1} {write script} {} {write script} {} {}} -test io-43.2 {Tcl_FileeventCmd: deleting when many present} {stdio unixExecs} { +test io-43.2 {Tcl_FileeventCmd: deleting when many present} -setup { + set f2 [open "|[list cat -u]" r+] + set f3 [open "|[list cat -u]" r+] +} -constraints {stdio unixExecs fileevent openpipe} -body { set result {} lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r] fileevent $f r "read f" @@ -5407,9 +5535,15 @@ test io-43.2 {Tcl_FileeventCmd: deleting when many present} {stdio unixExecs} { lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r] fileevent $f r {} lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r] -} {{} {} {} {read f} {read f2} {read f3} {read f} {} {read f3} {read f} {} {} {} {} {}} - -test io-44.1 {FileEventProc procedure: normal read event} {stdio unixExecs} { +} -cleanup { + catch {close $f2} + catch {close $f3} +} -result {{} {} {} {read f} {read f2} {read f3} {read f} {} {read f3} {read f} {} {} {} {} {}} + +test io-44.1 {FileEventProc procedure: normal read event} -setup { + set f2 [open "|[list cat -u]" r+] + set f3 [open "|[list cat -u]" r+] +} -constraints {stdio unixExecs fileevent openpipe} -body { fileevent $f2 readable [namespace code { set x [gets $f2]; fileevent $f2 readable {} }] @@ -5417,17 +5551,35 @@ test io-44.1 {FileEventProc procedure: normal read event} {stdio unixExecs} { 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 "set [namespace which -variable x] \$args" +} -cleanup { + catch {close $f2} + catch {close $f3} +} -result {text} +test io-44.2 {FileEventProc procedure: error in read event} -constraints { + stdio unixExecs fileevent openpipe +} -setup { + set f2 [open "|[list cat -u]" r+] + set f3 [open "|[list cat -u]" r+] + proc myHandler {msg options} { + variable x $msg + } + set handler [interp bgerror {}] + interp bgerror {} [namespace which myHandler] +} -body { fileevent $f2 readable {error bogus} puts $f2 text; flush $f2 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} { +} -cleanup { + interp bgerror {} $handler + catch {close $f2} + catch {close $f3} +} -result {bogus {}} +test io-44.3 {FileEventProc procedure: normal write event} -setup { + set f2 [open "|[list cat -u]" r+] + set f3 [open "|[list cat -u]" r+] +} -constraints {stdio unixExecs fileevent openpipe} -body { fileevent $f2 writable [namespace code { lappend x "triggered" incr count -1 @@ -5441,16 +5593,31 @@ test io-44.3 {FileEventProc procedure: normal write event} {stdio unixExecs} { 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 "set [namespace which -variable x] \$args" +} -cleanup { + catch {close $f2} + catch {close $f3} +} -result {initial triggered triggered triggered} +test io-44.4 {FileEventProc procedure: eror in write event} -constraints { + stdio unixExecs fileevent openpipe +} -setup { + set f2 [open "|[list cat -u]" r+] + set f3 [open "|[list cat -u]" r+] + proc myHandler {msg options} { + variable x $msg + } + set handler [interp bgerror {}] + interp bgerror {} [namespace which myHandler] +} -body { fileevent $f2 writable {error bad-write} 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} { +} -cleanup { + interp bgerror {} $handler + catch {close $f2} + catch {close $f3} +} -result {bad-write {}} +test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs openpipe fileevent} { set f4 [open "|[list [interpreter] $path(cat) << foo]" r] fileevent $f4 readable [namespace code { if {[gets $f4 line] < 0} { @@ -5467,13 +5634,10 @@ test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs} { set x } {initial foo eof} -catch {close $f2} -catch {close $f3} - - close $f makeFile "foo bar" foo -test io-45.1 {DeleteFileEvent, cleanup on close} { + +test io-45.1 {DeleteFileEvent, cleanup on close} {fileevent} { set f [open $path(foo) r] fileevent $f readable [namespace code { lappend x "binding triggered: \"[gets $f]\"" @@ -5486,7 +5650,7 @@ test io-45.1 {DeleteFileEvent, cleanup on close} { vwait [namespace which -variable y] set x } {initial} -test io-45.2 {DeleteFileEvent, cleanup on close} { +test io-45.2 {DeleteFileEvent, cleanup on close} {fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] fileevent $f readable [namespace code { @@ -5503,7 +5667,7 @@ test io-45.2 {DeleteFileEvent, cleanup on close} { close $f2 set x } {initial {f2 triggered: "foo bar"}} -test io-45.3 {DeleteFileEvent, cleanup on close} { +test io-45.3 {DeleteFileEvent, cleanup on close} {fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] set f3 [open $path(foo) r] @@ -5526,18 +5690,18 @@ 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]] -test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent} { +test io-46.1 {Tcl event loop vs multiple interpreters} {testfevent fileevent} { testfevent create - testfevent cmd [format { - set f [open {%s} r] + set script "set f \[[list open $path(foo) r]]\n" + append script { set x "no event" fileevent $f readable [namespace code { set x "f triggered: [gets $f]" fileevent $f readable {} }] - } $path(foo)] + } + testfevent cmd $script after 1 ;# We must delay because Windows takes a little time to notice update testfevent cmd {close $f} @@ -5566,7 +5730,7 @@ test io-46.3 {Tcl event loop vs multiple interpreters} testfevent { } } {0 0 {0 timer}} -test io-47.1 {fileevent vs multiple interpreters} testfevent { +test io-47.1 {fileevent vs multiple interpreters} {testfevent fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] set f3 [open $path(foo) r] @@ -5585,7 +5749,7 @@ test io-47.1 {fileevent vs multiple interpreters} testfevent { close $f3 set x } {{} {script 1} {} {sript 3}} -test io-47.2 {deleting fileevent on interpreter delete} testfevent { +test io-47.2 {deleting fileevent on interpreter delete} {testfevent fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] set f3 [open $path(foo) r] @@ -5606,7 +5770,7 @@ test io-47.2 {deleting fileevent on interpreter delete} testfevent { close $f4 set x } {{script 1} {} {} {script 4}} -test io-47.3 {deleting fileevent on interpreter delete} testfevent { +test io-47.3 {deleting fileevent on interpreter delete} {testfevent fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] set f3 [open $path(foo) r] @@ -5627,7 +5791,7 @@ test io-47.3 {deleting fileevent on interpreter delete} testfevent { close $f4 set x } {{script 1} {script 2} {} {}} -test io-47.4 {file events on shared files and multiple interpreters} testfevent { +test io-47.4 {file events on shared files and multiple interpreters} {testfevent fileevent} { set f [open $path(foo) r] set f2 [open $path(foo) r] testfevent create @@ -5643,7 +5807,7 @@ test io-47.4 {file events on shared files and multiple interpreters} testfevent close $f2 set x } {{script 3} {script 1} {script 2}} -test io-47.5 {file events on shared files, deleting file events} testfevent { +test io-47.5 {file events on shared files, deleting file events} {testfevent fileevent} { set f [open $path(foo) r] testfevent create testfevent share $f @@ -5656,7 +5820,7 @@ test io-47.5 {file events on shared files, deleting file events} testfevent { close $f set x } {{} {script 2}} -test io-47.6 {file events on shared files, deleting file events} testfevent { +test io-47.6 {file events on shared files, deleting file events} {testfevent fileevent} { set f [open $path(foo) r] testfevent create testfevent share $f @@ -5672,7 +5836,7 @@ test io-47.6 {file events on shared files, deleting file events} testfevent { set path(bar) [makeFile {} bar] -test io-48.1 {testing readability conditions} { +test io-48.1 {testing readability conditions} {fileevent} { set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg @@ -5698,7 +5862,7 @@ test io-48.1 {testing readability conditions} { vwait [namespace which -variable x] list $x $l } {done {called called called called called called called}} -test io-48.2 {testing readability conditions} {nonBlockFiles} { +test io-48.2 {testing readability conditions} {nonBlockFiles fileevent} { set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg @@ -5725,10 +5889,8 @@ test io-48.2 {testing readability conditions} {nonBlockFiles} { vwait [namespace which -variable x] list $x $l } {done {called called called called called called called}} - set path(my_script) [makeFile {} my_script] - -test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} { +test io-48.3 {testing readability conditions} {stdio unix nonBlockFiles openpipe fileevent} { set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg @@ -5765,19 +5927,19 @@ test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles} { } set l "" variable x not_done - puts $f [format {source {%s}} $path(my_script)] - puts $f [format {set f [open {%s} r]} $path(bar)] + puts $f [list source $path(my_script)] + puts $f "set f \[[list open $path(bar) r]]" puts $f {copy_slowly $f} puts $f {exit} 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 +test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf - set c [format "abc\ndef\n%c" 26] + variable c [format "abc\ndef\n%c" 26] puts -nonewline $f $c close $f proc consume {f} { @@ -5801,8 +5963,8 @@ test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} { 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 +test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -5829,8 +5991,8 @@ test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} { 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 +test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%c" 26] @@ -5857,8 +6019,8 @@ test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} { 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 +test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -5885,8 +6047,8 @@ test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} { 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 +test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%c" 26] @@ -5913,8 +6075,8 @@ test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} { 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 +test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -5941,8 +6103,8 @@ test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} { 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 +test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -5969,8 +6131,8 @@ test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} { 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 +test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf set c [format "abc\ndef\n%c" 26] @@ -5997,8 +6159,8 @@ test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} { 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 +test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -6025,8 +6187,8 @@ test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} { 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 +test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation cr set c [format "abc\ndef\n%c" 26] @@ -6053,8 +6215,8 @@ test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} { 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 +test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%cfoo\nbar\n" 26] @@ -6081,8 +6243,8 @@ test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} { 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 +test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {fileevent} { + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation crlf set c [format "abc\ndef\n%c" 26] @@ -6111,7 +6273,7 @@ test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} { } {3 {abc def {}}} test io-49.1 {testing crlf reading, leftover cr disgorgment} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" @@ -6140,7 +6302,7 @@ test io-49.1 {testing crlf reading, leftover cr disgorgment} { } "7 a 1 [list \r] 2 b 3 [list \r] 4 c 5 { } 7 0 {} 1" test io-49.2 {testing crlf reading, leftover cr disgorgment} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" @@ -6163,7 +6325,7 @@ test io-49.2 {testing crlf reading, leftover cr disgorgment} { set l } "7 [list a\r] 2 [list b\r] 4 [list c\n] 7 0 {} 7 1" test io-49.3 {testing crlf reading, leftover cr disgorgment} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" @@ -6184,7 +6346,7 @@ test io-49.3 {testing crlf reading, leftover cr disgorgment} { set l } "7 [list a\rb] 3 [list \rc\n] 7 0 {} 7 1" test io-49.4 {testing crlf reading, leftover cr disgorgment} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" @@ -6205,7 +6367,7 @@ test io-49.4 {testing crlf reading, leftover cr disgorgment} { set l } "7 [list a\rb] 3 [list \rc] 7 0 {} 7 1" test io-49.5 {testing crlf reading, leftover cr disgorgment} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] fconfigure $f -translation lf puts -nonewline $f "a\rb\rc\r\n" @@ -6222,10 +6384,9 @@ test io-49.5 {testing crlf reading, leftover cr disgorgment} { close $f set l } [list 7 a\rb\rc 7 {} 7 1] - -testConstraint testchannelevent [llength [info commands testchannelevent]] + test io-50.1 {testing handler deletion} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6241,7 +6402,7 @@ test io-50.1 {testing handler deletion} {testchannelevent} { set z } called test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6259,7 +6420,7 @@ test io-50.2 {testing handler deletion with multiple handlers} {testchannelevent [list [list called delhandler $f 0] [list called delhandler $f 1]] } 0 test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6285,7 +6446,7 @@ test io-50.3 {testing handler deletion with multiple handlers} {testchannelevent [list delhandler $f 0 deleted myself]] } 0 test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6302,15 +6463,15 @@ test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} { update } } - set u toplevel - set z "" + variable u toplevel + variable z "" update close $f string compare [string tolower $z] \ {{delrecursive calling recursive} {delrecursive deleting recursive}} } 0 test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6344,7 +6505,7 @@ test io-50.5 {testing handler deletion vs reentrant calls} {testchannelevent} { {del deleted myself} {del after update}] } 0 test io-50.6 {testing handler deletion vs reentrant calls} {testchannelevent} { - removeFile test1 + file delete $path(test1) set f [open $path(test1) w] close $f set f [open $path(test1) r] @@ -6398,27 +6559,29 @@ test io-51.1 {Test old socket deletion on Macintosh} {socket} { close $s set wait done } - set ss [socket -server [namespace code accept] 0] + set ss [socket -server [namespace code accept] -myaddr 127.0.0.1 0] + set port [lindex [fconfigure $ss -sockname] 2] + variable wait "" - set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + set cs [socket 127.0.0.1 $port] vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + set cs [socket 127.0.0.1 $port] vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + set cs [socket 127.0.0.1 $port] vwait [namespace which -variable wait] lappend result [gets $cs] close $cs set wait "" - set cs [socket [info hostname] [lindex [fconfigure $ss -sockname] 2]] + set cs [socket 127.0.0.1 $port] vwait [namespace which -variable wait] lappend result [gets $cs] close $cs @@ -6426,8 +6589,8 @@ test io-51.1 {Test old socket deletion on Macintosh} {socket} { set result } {sock1 sock2 sock3 sock4} -test io-52.1 {TclCopyChannel} { - removeFile test1 +test io-52.1 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fcopy $f1 $f2 -command { # } @@ -6436,8 +6599,8 @@ test io-52.1 {TclCopyChannel} { close $f2 string compare $msg "channel \"$f1\" is busy" } {0} -test io-52.2 {TclCopyChannel} { - removeFile test1 +test io-52.2 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] set f3 [open $thisScript] @@ -6448,8 +6611,8 @@ test io-52.2 {TclCopyChannel} { close $f3 string compare $msg "channel \"$f2\" is busy" } {0} -test io-52.3 {TclCopyChannel} { - removeFile test1 +test io-52.3 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6465,8 +6628,8 @@ test io-52.3 {TclCopyChannel} { } set result } {0 0 ok} -test io-52.4 {TclCopyChannel} { - removeFile test1 +test io-52.4 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6477,13 +6640,13 @@ test io-52.4 {TclCopyChannel} { close $f2 lappend result [file size $path(test1)] } {0 0 40} -test io-52.5 {TclCopyChannel} { - removeFile test1 +test io-52.5 {TclCopyChannel, all} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 fconfigure $f2 -translation lf -blocking 0 - fcopy $f1 $f2 -size -1 + fcopy $f1 $f2 -size -1 ;# -1 means 'copy all', same as if no -size specified. set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]] close $f1 close $f2 @@ -6494,8 +6657,42 @@ test io-52.5 {TclCopyChannel} { } set result } {0 0 ok} -test io-52.6 {TclCopyChannel} { - removeFile test1 +test io-52.5a {TclCopyChannel, all, other negative value} {fcopy} { + file delete $path(test1) + set f1 [open $thisScript] + set f2 [open $path(test1) w] + fconfigure $f1 -translation lf -blocking 0 + fconfigure $f2 -translation lf -blocking 0 + fcopy $f1 $f2 -size -2 ;# < 0 behaves like -1, copy all + set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]] + close $f1 + close $f2 + set s1 [file size $thisScript] + set s2 [file size $path(test1)] + if {"$s1" == "$s2"} { + lappend result ok + } + set result +} {0 0 ok} +test io-52.5b {TclCopyChannel, all, wrap to negative value} {fcopy} { + file delete $path(test1) + set f1 [open $thisScript] + set f2 [open $path(test1) w] + fconfigure $f1 -translation lf -blocking 0 + fconfigure $f2 -translation lf -blocking 0 + fcopy $f1 $f2 -size 3221176172 ;# Wrapped to < 0, behaves like -1, copy all + set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]] + close $f1 + close $f2 + set s1 [file size $thisScript] + set s2 [file size $path(test1)] + if {"$s1" == "$s2"} { + lappend result ok + } + set result +} {0 0 ok} +test io-52.6 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6511,8 +6708,8 @@ test io-52.6 {TclCopyChannel} { } set result } {0 0 ok} -test io-52.7 {TclCopyChannel} { - removeFile test1 +test io-52.7 {TclCopyChannel} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6528,9 +6725,9 @@ test io-52.7 {TclCopyChannel} { } set result } {0 0 ok} -test io-52.8 {TclCopyChannel} {stdio} { - removeFile test1 - removeFile pipe +test io-52.8 {TclCopyChannel} {stdio openpipe fcopy} { + file delete $path(test1) + file delete $path(pipe) set f1 [open $path(pipe) w] fconfigure $f1 -translation lf puts $f1 " @@ -6554,19 +6751,16 @@ test io-52.8 {TclCopyChannel} {stdio} { close $f2 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} { +test io-52.9 {TclCopyChannel & encodings} {fcopy} { # Copy kyrillic to UTF-8, using fcopy. set in [open $path(kyrillic.txt) r] @@ -6596,8 +6790,7 @@ test io-52.9 {TclCopyChannel & encodings} { [file size $path(utf8-fcopy.txt)] \ [file size $path(utf8-rp.txt)] } {3 5 5} - -test io-52.10 {TclCopyChannel & encodings} { +test io-52.10 {TclCopyChannel & encodings} {fcopy} { # encoding to binary (=> implies that the # internal utf-8 is written) @@ -6614,8 +6807,7 @@ test io-52.10 {TclCopyChannel & encodings} { file size $path(utf8-fcopy.txt) } 5 - -test io-52.11 {TclCopyChannel & encodings} { +test io-52.11 {TclCopyChannel & encodings} {fcopy} { # binary to encoding => the input has to be # in utf-8 to make sense to the encoder @@ -6633,9 +6825,8 @@ test io-52.11 {TclCopyChannel & encodings} { file size $path(kyrillic.txt) } 3 - -test io-53.1 {CopyData} { - removeFile test1 +test io-53.1 {CopyData} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6646,8 +6837,8 @@ test io-53.1 {CopyData} { close $f2 lappend result [file size $path(test1)] } {0 0 0} -test io-53.2 {CopyData} { - removeFile test1 +test io-53.2 {CopyData} {fcopy} { + file delete $path(test1) set f1 [open $thisScript] set f2 [open $path(test1) w] fconfigure $f1 -translation lf -blocking 0 @@ -6665,20 +6856,22 @@ test io-53.2 {CopyData} { } set result } {0 0 ok} -test io-53.3 {CopyData: background read underflow} {stdio unixOnly} { - removeFile test1 - removeFile pipe +test io-53.3 {CopyData: background read underflow} {stdio unix openpipe fcopy} { + file delete $path(test1) + file delete $path(pipe) set f1 [open $path(pipe) w] - puts $f1 [format { + puts -nonewline $f1 { puts ready flush stdout ;# Don't assume line buffered! fcopy stdin stdout -command { set x } vwait x - set f [open "%s" w] + set f [} + puts $f1 [list open $path(test1) w]] + puts $f1 { fconfigure $f -translation lf puts $f "done" close $f - } $path(test1)] + } close $f1 set f1 [open "|[list [interpreter] $path(pipe)]" r+] set result [gets $f1] @@ -6695,14 +6888,14 @@ test io-53.3 {CopyData: background read underflow} {stdio unixOnly} { close $f set result } "ready line1 line2 {done\n}" -test io-53.4 {CopyData: background write overflow} {stdio unixOnly} { +test io-53.4 {CopyData: background write overflow} {stdio unix openpipe fileevent fcopy} { set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n variable x for {set x 0} {$x < 12} {incr x} { append big $big } - removeFile test1 - removeFile pipe + file delete $path(test1) + file delete $path(pipe) set f1 [open $path(pipe) w] puts $f1 { puts ready @@ -6733,7 +6926,6 @@ test io-53.4 {CopyData: background write overflow} {stdio unixOnly} { set x } done set result {} - proc FcopyTestAccept {sock args} { after 1000 "close $sock" } @@ -6745,10 +6937,9 @@ proc FcopyTestDone {bytes {error {}}} { set fcopyTestDone 0 } } - -test io-53.5 {CopyData: error during fcopy} {socket} { +test io-53.5 {CopyData: error during fcopy} {socket fcopy} { variable fcopyTestDone - set listen [socket -server [namespace code FcopyTestAccept] 0] + set listen [socket -server [namespace code FcopyTestAccept] -myaddr 127.0.0.1 0] set in [open $thisScript] ;# 126 K set out [socket 127.0.0.1 [lindex [fconfigure $listen -sockname] 2]] catch {unset fcopyTestDone} @@ -6762,10 +6953,10 @@ test io-53.5 {CopyData: error during fcopy} {socket} { close $out set fcopyTestDone ;# 1 for error condition } 1 -test io-53.6 {CopyData: error during fcopy} {stdio} { +test io-53.6 {CopyData: error during fcopy} {stdio openpipe fcopy} { variable fcopyTestDone - removeFile pipe - removeFile test1 + file delete $path(pipe) + file delete $path(test1) catch {unset fcopyTestDone} set f1 [open $path(pipe) w] puts $f1 "exit 1" @@ -6781,28 +6972,23 @@ test io-53.6 {CopyData: error during fcopy} {stdio} { 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 + set fcopyTestDone 1 } elseif {[eof $in]} { - set fcopyTestDone 0 + 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]] - ] + 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} { +test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio openpipe fcopy} { variable fcopyTestDone - removeFile pipe - removeFile test1 + file delete $path(pipe) catch {unset fcopyTestDone} set fcopyTestCount 0 set f1 [open $path(pipe) w] @@ -6834,8 +7020,282 @@ test io-53.7 {CopyData: Flooding fcopy from pipe} {stdio} { # -1=error 0=script error N=number of bytes expr ($fcopyTestDone == 0) ? $fcopyTestCount : -1 } {3450} - -test io-54.1 {Recursive channel events} {socket} { +test io-53.8 {CopyData: async callback and error handling, Bug 1932639} -setup { + # copy progress callback. errors out intentionally + proc ::cmd args { + lappend ::RES "CMD $args" + error !STOP + } + # capture callback error here + proc ::bgerror args { + lappend ::RES "bgerror/OK $args" + set ::forever has-been-reached + return + } + # Files we use for our channels + set foo [makeFile ashgdfashdgfasdhgfasdhgf foo] + set bar [makeFile {} bar] + # Channels to copy between + set f [open $foo r] ; fconfigure $f -translation binary + set g [open $bar w] ; fconfigure $g -translation binary -buffering none +} -constraints {stdio openpipe fcopy} -body { + # Record input size, so that result is always defined + lappend ::RES [file size $bar] + # Run the copy. Should not invoke -command now. + fcopy $f $g -size 2 -command ::cmd + # Check that -command was not called synchronously + set sbs [file size $bar] + lappend ::RES [expr {($sbs > 0) ? "sync/FAIL" : "sync/OK"}] $sbs + # Now let the async part happen. Should capture the error in cmd + # via bgerror. If not break the event loop via timer. + set token [after 1000 { + lappend ::RES {bgerror/FAIL timeout} + set ::forever has-been-reached + }] + vwait ::forever + catch {after cancel $token} + # Report + set ::RES +} -cleanup { + close $f + close $g + catch {unset ::RES} + catch {unset ::forever} + rename ::cmd {} + rename ::bgerror {} + removeFile foo + removeFile bar +} -result {0 sync/OK 0 {CMD 2} {bgerror/OK !STOP}} +test io-53.8a {CopyData: async callback and error handling, Bug 1932639, at eof} -setup { + # copy progress callback. errors out intentionally + proc ::cmd args { + lappend ::RES "CMD $args" + set ::forever has-been-reached + return + } + # Files we use for our channels + set foo [makeFile ashgdfashdgfasdhgfasdhgf foo] + set bar [makeFile {} bar] + # Channels to copy between + set f [open $foo r] ; fconfigure $f -translation binary + set g [open $bar w] ; fconfigure $g -translation binary -buffering none +} -constraints {stdio openpipe fcopy} -body { + # Initialize and force eof on the input. + seek $f 0 end ; read $f 1 + set ::RES [eof $f] + # Run the copy. Should not invoke -command now. + fcopy $f $g -size 2 -command ::cmd + # Check that -command was not called synchronously + lappend ::RES [expr {([llength $::RES] > 1) ? "sync/FAIL" : "sync/OK"}] + # Now let the async part happen. Should capture the eof in cmd + # If not break the event loop via timer. + set token [after 1000 { + lappend ::RES {cmd/FAIL timeout} + set ::forever has-been-reached + }] + vwait ::forever + catch {after cancel $token} + # Report + set ::RES +} -cleanup { + close $f + close $g + catch {unset ::RES} + catch {unset ::forever} + rename ::cmd {} + removeFile foo + removeFile bar +} -result {1 sync/OK {CMD 0}} +test io-53.8b {CopyData: async callback and -size 0} -setup { + # copy progress callback. errors out intentionally + proc ::cmd args { + lappend ::RES "CMD $args" + set ::forever has-been-reached + return + } + # Files we use for our channels + set foo [makeFile ashgdfashdgfasdhgfasdhgf foo] + set bar [makeFile {} bar] + # Channels to copy between + set f [open $foo r] ; fconfigure $f -translation binary + set g [open $bar w] ; fconfigure $g -translation binary -buffering none +} -constraints {stdio openpipe fcopy} -body { + set ::RES {} + # Run the copy. Should not invoke -command now. + fcopy $f $g -size 0 -command ::cmd + # Check that -command was not called synchronously + lappend ::RES [expr {([llength $::RES] > 1) ? "sync/FAIL" : "sync/OK"}] + # Now let the async part happen. Should capture the eof in cmd + # If not break the event loop via timer. + set token [after 1000 { + lappend ::RES {cmd/FAIL timeout} + set ::forever has-been-reached + }] + vwait ::forever + catch {after cancel $token} + # Report + set ::RES +} -cleanup { + close $f + close $g + catch {unset ::RES} + catch {unset ::forever} + rename ::cmd {} + removeFile foo + removeFile bar +} -result {sync/OK {CMD 0}} +test io-53.9 {CopyData: -size and event interaction, Bug 780533} -setup { + set out [makeFile {} out] + set err [makeFile {} err] + set pipe [open "|[list [info nameofexecutable] 2> $err]" r+] + fconfigure $pipe -translation binary -buffering line + puts $pipe { + fconfigure stdout -translation binary -buffering line + puts stderr Waiting... + after 1000 + foreach x {a b c} { + puts stderr Looping... + puts $x + after 500 + } + proc bye args { + if {[gets stdin line]<0} { + puts stderr "CHILD: EOF detected, exiting" + exit + } else { + puts stderr "CHILD: ignoring line: $line" + } + } + puts stderr Now-sleeping-forever + fileevent stdin readable bye + vwait forever + } + proc ::done args { + set ::forever OK + return + } + set ::forever {} + set out [open $out w] +} -constraints {stdio openpipe fcopy} -body { + fcopy $pipe $out -size 6 -command ::done + set token [after 5000 { + set ::forever {fcopy hangs} + }] + vwait ::forever + catch {after cancel $token} + set ::forever +} -cleanup { + close $pipe + rename ::done {} + after 1000; # Give Windows time to kill the process + catch {close $out} + catch {removeFile out} + catch {removeFile err} + catch {unset ::forever} +} -result OK +test io-53.10 {Bug 1350564, multi-directional fcopy} -setup { + set err [makeFile {} err] + set pipe [open "|[list [info nameofexecutable] 2> $err]" r+] + fconfigure $pipe -translation binary -buffering line + puts $pipe { + fconfigure stderr -buffering line + # Kill server when pipe closed by invoker. + proc bye args { + if {![eof stdin]} { gets stdin ; return } + puts stderr BYE + exit + } + # Server code. Bi-directional copy between 2 sockets. + proc geof {sok} { + puts stderr DONE/$sok + close $sok + } + proc new {sok args} { + puts stderr NEW/$sok + global l srv + fconfigure $sok -translation binary -buffering none + lappend l $sok + if {[llength $l]==2} { + close $srv + foreach {a b} $l break + fcopy $a $b -command [list geof $a] + fcopy $b $a -command [list geof $b] + puts stderr 2COPY + } + puts stderr ... + } + puts stderr SRV + set l {} + set srv [socket -server new 9999] + puts stderr WAITING + fileevent stdin readable bye + puts OK + vwait forever + } + # wait for OK from server. + gets $pipe + # Now the two clients. + proc ::done {sock} { + if {[eof $sock]} { close $sock ; return } + lappend ::forever [gets $sock] + return + } + set a [socket 127.0.0.1 9999] + set b [socket 127.0.0.1 9999] + fconfigure $a -translation binary -buffering none + fconfigure $b -translation binary -buffering none + fileevent $a readable [list ::done $a] + fileevent $b readable [list ::done $b] +} -constraints {stdio openpipe fcopy} -body { + # Now pass data through the server in both directions. + set ::forever {} + puts $a AB + vwait ::forever + puts $b BA + vwait ::forever + set ::forever +} -cleanup { + catch {close $a} + catch {close $b} + close $pipe + rename ::done {} + after 1000 ;# Give Windows time to kill the process + removeFile err + catch {unset ::forever} +} -result {AB BA} +test io-53.11 {Bug 2895565} -setup { + set in [makeFile {} in] + set f [open $in w] + fconfigure $f -encoding utf-8 -translation binary + puts -nonewline $f [string repeat "Ho hum\n" 11] + close $f + set inChan [open $in r] + fconfigure $inChan -translation binary + set out [makeFile {} out] + set outChan [open $out w] + fconfigure $outChan -encoding cp1252 -translation crlf + proc CopyDone {bytes args} { + variable done + if {[llength $args]} { + set done "Error: '[lindex $args 0]' after $bytes bytes copied" + } else { + set done "$bytes bytes copied" + } + } +} -body { + variable done + after 2000 [list set [namespace which -variable done] timeout] + fcopy $inChan $outChan -size 40 -command [namespace which CopyDone] + vwait [namespace which -variable done] + set done +} -cleanup { + close $outChan + close $inChan + removeFile out + removeFile in +} -result {40 bytes copied} + +test io-54.1 {Recursive channel events} {socket fileevent} { # This test checks to see if file events are delivered during recursive # event loops when there is buffered data on the channel. @@ -6856,14 +7316,14 @@ test io-54.1 {Recursive channel events} {socket} { } incr x } - set ss [socket -server [namespace code accept] 0] + set ss [socket -server [namespace code accept] -myaddr 127.0.0.1 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] [lindex [fconfigure $ss -sockname] 2]]}]} { + if {![catch {set cs [socket 127.0.0.1 [lindex [fconfigure $ss -sockname] 2]]}]} { set done 1 break } @@ -6889,10 +7349,10 @@ test io-54.1 {Recursive channel events} {socket} { close $cs list $result $x } {{{line 1} 1 2} 2} -test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { +test io-54.2 {Testing for busy-wait in recursive channel events} {socket fileevent} { set accept {} set after {} - variable s [socket -server [namespace code accept] 0] + variable s [socket -server [namespace code accept] -myaddr 127.0.0.1 0] proc accept {s a p} { variable counter variable accept @@ -6951,7 +7411,9 @@ test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { set path(fooBar) [makeFile {} fooBar] -test io-55.1 {ChannelEventScriptInvoker: deletion} { +test io-55.1 {ChannelEventScriptInvoker: deletion} -constraints { + fileevent +} -setup { variable x proc eventScript {fd} { variable x @@ -6959,13 +7421,20 @@ test io-55.1 {ChannelEventScriptInvoker: deletion} { error "planned error" set x whoops } - proc ::bgerror {args} "set [namespace which -variable x] got_error" + proc myHandler args { + variable x got_error + } + set handler [interp bgerror {}] + interp bgerror {} [namespace which myHandler] +} -body { 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} +} -cleanup { + interp bgerror {} $handler +} -result {got_error} test io-56.1 {ChannelTimerProc} {testchannelevent} { set f [open $path(fooBar) w] @@ -6988,12 +7457,12 @@ test io-56.1 {ChannelTimerProc} {testchannelevent} { lappend result $y } {2 done} -test io-57.1 {buffered data and file events, gets} { +test io-57.1 {buffered data and file events, gets} {fileevent} { proc accept {sock args} { variable s2 set s2 $sock } - set server [socket -server [namespace code accept] 0] + set server [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set s [socket 127.0.0.1 [lindex [fconfigure $server -sockname] 2]] variable s2 vwait [namespace which -variable s2] @@ -7011,12 +7480,12 @@ test io-57.1 {buffered data and file events, gets} { close $server set result } {12 readable 34567890 timer} -test io-57.2 {buffered data and file events, read} { +test io-57.2 {buffered data and file events, read} {fileevent} { proc accept {sock args} { variable s2 set s2 $sock } - set server [socket -server [namespace code accept] 0] + set server [socket -server [namespace code accept] -myaddr 127.0.0.1 0] set s [socket 127.0.0.1 [lindex [fconfigure $server -sockname] 2]] variable s2 vwait [namespace which -variable s2] @@ -7034,8 +7503,8 @@ test io-57.2 {buffered data and file events, read} { close $server set result } {1 readable 234567890 timer} - -test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc} { + +test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc openpipe fileevent} { set out [open $path(script) w] puts $out { puts "normal message from pipe" @@ -7062,14 +7531,12 @@ test io-58.1 {Tcl_NotifyChannel and error when closing} {stdio unixOrPc} { list $x $result } {1 {gets {normal message from pipe} gets {} catch {error message from pipe}}} - -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. + # threads, i.e. 'Threads'. set f [open $path(longfile) r] set result [testchannel mthread $f] @@ -7077,8 +7544,7 @@ test io-59.1 {Thread reference of channels} {testmainthread testchannel} { string equal $result [testmainthread] } {1} - -test io-60.1 {writing illegal utf sequences} { +test io-60.1 {writing illegal utf sequences} {openpipe fileevent} { # This test will hang in older revisions of the core. set out [open $path(script) w] @@ -7109,12 +7575,295 @@ test io-60.1 {writing illegal utf sequences} { list $x $result } {1 {gets {} catch {error writing "stdout": invalid argument}}} +test io-61.1 {Reset eof state after changing the eof char} -setup { + set datafile [makeFile {} eofchar] + set f [open $datafile w] + fconfigure $f -translation binary + puts -nonewline $f [string repeat "Ho hum\n" 11] + puts $f = + set line [string repeat "Ge gla " 4] + puts -nonewline $f [string repeat [string trimright $line]\n 834] + close $f +} -body { + set f [open $datafile r] + fconfigure $f -eofchar = + set res {} + lappend res [read $f; tell $f] + fconfigure $f -eofchar {} + lappend res [read $f 1] + lappend res [read $f; tell $f] + # Any seek zaps the internals into a good state. + #seek $f 0 start + #seek $f 0 current + #lappend res [read $f; tell $f] + close $f + set res +} -cleanup { + removeFile eofchar +} -result {77 = 23431} + + +# Test the cutting and splicing of channels, this is incidentially the +# attach/detach facility of package Thread, but __without any +# safeguards__. It can also be used to emulate transfer of channels +# between threads, and is used for that here. + +test io-70.0 {Cutting & Splicing channels} {testchannel} { + set f [makeFile {... dummy ...} cutsplice] + set c [open $f r] + + set res {} + lappend res [catch {seek $c 0 start}] + testchannel cut $c + + lappend res [catch {seek $c 0 start}] + testchannel splice $c + + lappend res [catch {seek $c 0 start}] + close $c + + removeFile cutsplice + set res +} {0 1 0} + + +test io-70.1 {Transfer channel} {testchannel thread} { + set f [makeFile {... dummy ...} cutsplice] + set c [open $f r] + + set res {} + lappend res [catch {seek $c 0 start}] + testchannel cut $c + lappend res [catch {seek $c 0 start}] + + set tid [thread::create -preserved] + thread::send $tid [list set c $c] + thread::send $tid {load {} Tcltest} + lappend res [thread::send $tid { + testchannel splice $c + set res [catch {seek $c 0 start}] + close $c + set res + }] + + thread::release $tid + removeFile cutsplice + + set res +} {0 1 0} + +# ### ### ### ######### ######### ######### + +foreach {n msg expected} { + 0 {} {} + 1 {{message only}} {{message only}} + 2 {-options x} {-options x} + 3 {-options {x y} {the message}} {-options {x y} {the message}} + + 4 {-code 1 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 5 {-code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 6 {-code 1 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 7 {-code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 8 {-code error -level 0 -f ba snarf} {-code error -level 0 -f ba snarf} + 9 {-code ok -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 10 {-code error -level 5 -f ba snarf} {-code error -level 0 -f ba snarf} + 11 {-code ok -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 12 {-code boss -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 13 {-code boss -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 14 {-code 1 -level 0 -f ba} {-code 1 -level 0 -f ba} + 15 {-code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + 16 {-code 1 -level 5 -f ba} {-code 1 -level 0 -f ba} + 17 {-code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + 18 {-code error -level 0 -f ba} {-code error -level 0 -f ba} + 19 {-code ok -level 0 -f ba} {-code 1 -level 0 -f ba} + 20 {-code error -level 5 -f ba} {-code error -level 0 -f ba} + 21 {-code ok -level 5 -f ba} {-code 1 -level 0 -f ba} + 22 {-code boss -level 0 -f ba} {-code 1 -level 0 -f ba} + 23 {-code boss -level 5 -f ba} {-code 1 -level 0 -f ba} + 24 {-code 1 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 25 {-code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 26 {-code error -level X -f ba snarf} {-code error -level 0 -f ba snarf} + 27 {-code ok -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 28 {-code boss -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 29 {-code 1 -level X -f ba} {-code 1 -level 0 -f ba} + 30 {-code 0 -level X -f ba} {-code 1 -level 0 -f ba} + 31 {-code error -level X -f ba} {-code error -level 0 -f ba} + 32 {-code ok -level X -f ba} {-code 1 -level 0 -f ba} + 33 {-code boss -level X -f ba} {-code 1 -level 0 -f ba} + + 34 {-code 1 -code 1 -level 0 -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + 35 {-code 1 -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 36 {-code 1 -code 1 -level 5 -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + 37 {-code 1 -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 38 {-code 1 -code error -level 0 -f ba snarf} {-code 1 -code error -level 0 -f ba snarf} + 39 {-code 1 -code ok -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 40 {-code 1 -code error -level 5 -f ba snarf} {-code 1 -code error -level 0 -f ba snarf} + 41 {-code 1 -code ok -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 42 {-code 1 -code boss -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 43 {-code 1 -code boss -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 44 {-code 1 -code 1 -level 0 -f ba} {-code 1 -code 1 -level 0 -f ba} + 45 {-code 1 -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + 46 {-code 1 -code 1 -level 5 -f ba} {-code 1 -code 1 -level 0 -f ba} + 47 {-code 1 -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + 48 {-code 1 -code error -level 0 -f ba} {-code 1 -code error -level 0 -f ba} + 49 {-code 1 -code ok -level 0 -f ba} {-code 1 -level 0 -f ba} + 50 {-code 1 -code error -level 5 -f ba} {-code 1 -code error -level 0 -f ba} + 51 {-code 1 -code ok -level 5 -f ba} {-code 1 -level 0 -f ba} + 52 {-code 1 -code boss -level 0 -f ba} {-code 1 -level 0 -f ba} + 53 {-code 1 -code boss -level 5 -f ba} {-code 1 -level 0 -f ba} + 54 {-code 1 -code 1 -level X -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + 55 {-code 1 -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 56 {-code 1 -code error -level X -f ba snarf} {-code 1 -code error -level 0 -f ba snarf} + 57 {-code 1 -code ok -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 58 {-code 1 -code boss -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 59 {-code 1 -code 1 -level X -f ba} {-code 1 -code 1 -level 0 -f ba} + 60 {-code 1 -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + 61 {-code 1 -code error -level X -f ba} {-code 1 -code error -level 0 -f ba} + 62 {-code 1 -code ok -level X -f ba} {-code 1 -level 0 -f ba} + 63 {-code 1 -code boss -level X -f ba} {-code 1 -level 0 -f ba} + + 64 {-code 0 -code 1 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 65 {-code 0 -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 66 {-code 0 -code 1 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 67 {-code 0 -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 68 {-code 0 -code error -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 69 {-code 0 -code ok -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 70 {-code 0 -code error -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 71 {-code 0 -code ok -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 72 {-code 0 -code boss -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 73 {-code 0 -code boss -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 74 {-code 0 -code 1 -level 0 -f ba} {-code 1 -level 0 -f ba} + 75 {-code 0 -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + 76 {-code 0 -code 1 -level 5 -f ba} {-code 1 -level 0 -f ba} + 77 {-code 0 -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + 78 {-code 0 -code error -level 0 -f ba} {-code 1 -level 0 -f ba} + 79 {-code 0 -code ok -level 0 -f ba} {-code 1 -level 0 -f ba} + 80 {-code 0 -code error -level 5 -f ba} {-code 1 -level 0 -f ba} + 81 {-code 0 -code ok -level 5 -f ba} {-code 1 -level 0 -f ba} + 82 {-code 0 -code boss -level 0 -f ba} {-code 1 -level 0 -f ba} + 83 {-code 0 -code boss -level 5 -f ba} {-code 1 -level 0 -f ba} + 84 {-code 0 -code 1 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 85 {-code 0 -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 86 {-code 0 -code error -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 87 {-code 0 -code ok -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 88 {-code 0 -code boss -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + 89 {-code 0 -code 1 -level X -f ba} {-code 1 -level 0 -f ba} + 90 {-code 0 -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + 91 {-code 0 -code error -level X -f ba} {-code 1 -level 0 -f ba} + 92 {-code 0 -code ok -level X -f ba} {-code 1 -level 0 -f ba} + 93 {-code 0 -code boss -level X -f ba} {-code 1 -level 0 -f ba} + + 94 {-code 1 -code 1 -level 0 -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + 95 {-code 0 -code 1 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 96 {-code 1 -code 1 -level 5 -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + 97 {-code 0 -code 1 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + 98 {-code error -code 1 -level 0 -f ba snarf} {-code error -code 1 -level 0 -f ba snarf} + 99 {-code ok -code 1 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + a0 {-code error -code 1 -level 5 -f ba snarf} {-code error -code 1 -level 0 -f ba snarf} + a1 {-code ok -code 1 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + a2 {-code boss -code 1 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + a3 {-code boss -code 1 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + a4 {-code 1 -code 1 -level 0 -f ba} {-code 1 -code 1 -level 0 -f ba} + a5 {-code 0 -code 1 -level 0 -f ba} {-code 1 -level 0 -f ba} + a6 {-code 1 -code 1 -level 5 -f ba} {-code 1 -code 1 -level 0 -f ba} + a7 {-code 0 -code 1 -level 5 -f ba} {-code 1 -level 0 -f ba} + a8 {-code error -code 1 -level 0 -f ba} {-code error -code 1 -level 0 -f ba} + a9 {-code ok -code 1 -level 0 -f ba} {-code 1 -level 0 -f ba} + b0 {-code error -code 1 -level 5 -f ba} {-code error -code 1 -level 0 -f ba} + b1 {-code ok -code 1 -level 5 -f ba} {-code 1 -level 0 -f ba} + b2 {-code boss -code 1 -level 0 -f ba} {-code 1 -level 0 -f ba} + b3 {-code boss -code 1 -level 5 -f ba} {-code 1 -level 0 -f ba} + b4 {-code 1 -code 1 -level X -f ba snarf} {-code 1 -code 1 -level 0 -f ba snarf} + b5 {-code 0 -code 1 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + b6 {-code error -code 1 -level X -f ba snarf} {-code error -code 1 -level 0 -f ba snarf} + b7 {-code ok -code 1 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + b8 {-code boss -code 1 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + b9 {-code 1 -code 1 -level X -f ba} {-code 1 -code 1 -level 0 -f ba} + c0 {-code 0 -code 1 -level X -f ba} {-code 1 -level 0 -f ba} + c1 {-code error -code 1 -level X -f ba} {-code error -code 1 -level 0 -f ba} + c2 {-code ok -code 1 -level X -f ba} {-code 1 -level 0 -f ba} + c3 {-code boss -code 1 -level X -f ba} {-code 1 -level 0 -f ba} + + c4 {-code 1 -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + c5 {-code 0 -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + c6 {-code 1 -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + c7 {-code 0 -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + c8 {-code error -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + c9 {-code ok -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + d0 {-code error -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + d1 {-code ok -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + d2 {-code boss -code 0 -level 0 -f ba snarf} {-code 1 -level 0 -f ba snarf} + d3 {-code boss -code 0 -level 5 -f ba snarf} {-code 1 -level 0 -f ba snarf} + d4 {-code 1 -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + d5 {-code 0 -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + d6 {-code 1 -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + d7 {-code 0 -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + d8 {-code error -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + d9 {-code ok -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + e0 {-code error -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + e1 {-code ok -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + e2 {-code boss -code 0 -level 0 -f ba} {-code 1 -level 0 -f ba} + e3 {-code boss -code 0 -level 5 -f ba} {-code 1 -level 0 -f ba} + e4 {-code 1 -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + e5 {-code 0 -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + e6 {-code error -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + e7 {-code ok -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + e8 {-code boss -code 0 -level X -f ba snarf} {-code 1 -level 0 -f ba snarf} + e9 {-code 1 -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + f0 {-code 0 -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + f1 {-code error -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + f2 {-code ok -code 0 -level X -f ba} {-code 1 -level 0 -f ba} + f3 {-code boss -code 0 -level X -f ba} {-code 1 -level 0 -f ba} +} { + test io-71.$n {Tcl_SetChannelError} {testchannel} { + + set f [makeFile {... dummy ...} cutsplice] + set c [open $f r] + + set res [testchannel setchannelerror $c [lrange $msg 0 end]] + close $c + removeFile cutsplice + + set res + } [lrange $expected 0 end] + + test io-72.$n {Tcl_SetChannelErrorInterp} {testchannel} { + + set f [makeFile {... dummy ...} cutsplice] + set c [open $f r] + + set res [testchannel setchannelerrorinterp $c [lrange $msg 0 end]] + close $c + removeFile cutsplice + + set res + } [lrange $expected 0 end] +} + +test io-73.1 {channel Tcl_Obj SetChannelFromAny} {} { + # Test for Bug 1847044 - don't spoil type unless we have a valid channel + catch {close [lreplace [list a] 0 end]} +} {1} + +test io-73.2 {channel Tcl_Obj SetChannelFromAny, bug 2407783} -setup { + # Invalidate intrep of 'channel' Tcl_Obj when transiting between interpreters. + set f [open [info script] r] +} -body { + interp create foo + seek $f 0 + set code [catch {interp eval foo [list seek $f 0]} msg] + # The string map converts the changing channel handle to a fixed string + list $code [string map [list $f @@] $msg] +} -cleanup { + close $f +} -result {1 {can not find channel named "@@"}} +# ### ### ### ######### ######### ######### # cleanup -foreach file [list fooBar longfile script output test1 pipe my_script foo \ - bar test2 test3 cat stdout] { +foreach file [list fooBar longfile script script2 output test1 pipe my_script \ + test2 test3 cat stdout kyrillic.txt utf8-fcopy.txt utf8-rp.txt] { removeFile $file } cleanupTests |