diff options
author | stanton <stanton> | 1998-09-21 23:39:52 (GMT) |
---|---|---|
committer | stanton <stanton> | 1998-09-21 23:39:52 (GMT) |
commit | 494c2de3a748b449c69ce322a1a741f5a31fd4d5 (patch) | |
tree | c3ece48c0ae3f4ba54787e0e8e729b65752ef3f9 /tests/io.test | |
parent | 7a698c0488d99c0af42022714638ae1ba2afaa49 (diff) | |
download | tcl-494c2de3a748b449c69ce322a1a741f5a31fd4d5.zip tcl-494c2de3a748b449c69ce322a1a741f5a31fd4d5.tar.gz tcl-494c2de3a748b449c69ce322a1a741f5a31fd4d5.tar.bz2 |
Added contents of Tcl 8.1a2
Diffstat (limited to 'tests/io.test')
-rw-r--r-- | tests/io.test | 2373 |
1 files changed, 1964 insertions, 409 deletions
diff --git a/tests/io.test b/tests/io.test index 2b6670f..2f55660 100644 --- a/tests/io.test +++ b/tests/io.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) io.test 1.131 97/09/22 11:15:05 +# SCCS: @(#) io.test 1.149 98/02/10 17:49:32 if {[string compare test [info procs test]] == 1} then {source defs} @@ -21,6 +21,8 @@ if {"[info commands testchannel]" != "testchannel"} { return } +saveState + removeFile test1 removeFile pipe @@ -37,23 +39,22 @@ close $f set f [open cat w] puts $f { - if {$argv == {}} { - set argv - - } - foreach name $argv { - if {$name == "-"} { - set f stdin - } elseif {[catch {open $name r} f] != 0} { - puts stderr $f - continue - } - while {[eof $f] == 0} { - puts -nonewline stdout [read $f] - } - if {$f != "stdin"} { + set f stdin + if {$argv != ""} { + set f [open $argv] + } + fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar \x1a + fconfigure stdout -encoding binary -translation lf -buffering none + fileevent $f readable "foo $f" + proc foo {f} { + set x [read $f] + catch {puts -nonewline $x} + if {[eof $f]} { close $f + exit 0 } } + vwait forever } close $f @@ -124,6 +125,1427 @@ close $f # list $c $x #} {40 ok} +proc contents {file} { + set f [open $file] + fconfigure $f -translation binary + set a [read $f] + close $f + return $a +} + +test io-1.1 {Tcl_WriteChars: CheckChannelErrors} { + # no test, need to cause an async error. +} {} +test io-1.2 {Tcl_WriteChars: WriteBytes} { + set f [open test1 w] + fconfigure $f -encoding binary + puts -nonewline $f "a\u4e4d\0" + close $f + contents test1 +} "a\x4d\x00" +test io-1.3 {Tcl_WriteChars: WriteChars} { + set f [open test1 w] + fconfigure $f -encoding shiftjis + puts -nonewline $f "a\u4e4d\0" + close $f + contents test1 +} "a\x93\xe1\x00" + +test io-2.1 {WriteBytes} { + # loop until all bytes are written + + set f [open test1 w] + fconfigure $f -encoding binary -buffersize 16 -translation crlf + puts $f "abcdefghijklmnopqrstuvwxyz" + close $f + contents test1 +} "abcdefghijklmnopqrstuvwxyz\r\n" +test io-2.2 {WriteBytes: savedLF > 0} { + # After flushing buffer, there was a \n left over from the last + # \n -> \r\n expansion. It gets stuck at beginning of this buffer. + + set f [open test1 w] + fconfigure $f -encoding binary -buffersize 16 -translation crlf + puts -nonewline $f "123456789012345\n12" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "123456789012345\r" "123456789012345\r\n12"] +test io-2.3 {WriteBytes: flush on line} { + # Tcl "line" buffering has weird behavior: if current buffer contains + # a \n, entire buffer gets flushed. Logical behavior would be to flush + # only up to the \n. + + set f [open test1 w] + fconfigure $f -encoding binary -buffering line -translation crlf + puts -nonewline $f "\n12" + set x [contents test1] + close $f + set x +} "\r\n12" + +test io-3.1 {WriteChars: compatibility with WriteBytes} { + # loop until all bytes are written + + set f [open test1 w] + fconfigure $f -encoding ascii -buffersize 16 -translation crlf + puts $f "abcdefghijklmnopqrstuvwxyz" + close $f + contents test1 +} "abcdefghijklmnopqrstuvwxyz\r\n" +test io-3.2 {WriteChars: compatibility with WriteBytes: savedLF > 0} { + # After flushing buffer, there was a \n left over from the last + # \n -> \r\n expansion. It gets stuck at beginning of this buffer. + + set f [open test1 w] + fconfigure $f -encoding ascii -buffersize 16 -translation crlf + puts -nonewline $f "123456789012345\n12" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "123456789012345\r" "123456789012345\r\n12"] +test io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} { + # Tcl "line" buffering has weird behavior: if current buffer contains + # a \n, entire buffer gets flushed. Logical behavior would be to flush + # only up to the \n. + + set f [open test1 w] + fconfigure $f -encoding ascii -buffering line -translation crlf + puts -nonewline $f "\n12" + set x [contents test1] + close $f + set x +} "\r\n12" +test io-3.4 {WriteChars: loop over stage buffer} { + # stage buffer maps to more than can be queued at once. + + set f [open test1 w] + fconfigure $f -encoding jis0208 -buffersize 16 + puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "!)!)!)!)!)!)!)!)" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"] +test io-3.5 {WriteChars: saved != 0} { + # Bytes produced by UtfToExternal from end of last channel buffer + # had to be moved to beginning of next channel buffer to preserve + # requested buffersize. + + set f [open test1 w] + fconfigure $f -encoding jis0208 -buffersize 17 + puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"] +test io-3.6 {WriteChars: (stageRead + dstWrote == 0)} { + # One incomplete UTF-8 character at end of staging buffer. Backup + # in src to the beginning of that UTF-8 character and try again. + # + # Translate the first 16 bytes, produce 14 bytes of output, 2 left over + # (first two bytes of \uff21 in UTF-8). Given those two bytes try + # translating them again, find that no bytes are read produced, and break + # to outer loop where those two bytes will have the remaining 4 bytes + # (the last byte of \uff21 plus the all of \uff22) appended. + + set f [open test1 w] + fconfigure $f -encoding shiftjis -buffersize 16 + puts -nonewline $f "12345678901234\uff21\uff22" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "12345678901234\x82\x60" "12345678901234\x82\x60\x82\x61"] +test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} { + # When translating UTF-8 to external, the produced bytes went past end + # of the channel buffer. This is done purpose -- we then truncate the + # bytes at the end of the partial character to preserve the requested + # blocksize on flush. The truncated bytes are moved to the beginning + # of the next channel buffer. + + set f [open test1 w] + fconfigure $f -encoding jis0208 -buffersize 17 + puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"] + +test io-4.1 {TranslateOutputEOL: lf} { + # search for \n + + set f [open test1 w] + fconfigure $f -buffering line -translation lf + puts $f "abcde" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "abcde\n" "abcde\n"] +test io-4.2 {TranslateOutputEOL: cr} { + # search for \n, replace with \r + + set f [open test1 w] + fconfigure $f -buffering line -translation cr + puts $f "abcde" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "abcde\r" "abcde\r"] +test io-4.3 {TranslateOutputEOL: crlf} { + # simple case: search for \n, replace with \r + + set f [open test1 w] + fconfigure $f -buffering line -translation crlf + puts $f "abcde" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "abcde\r\n" "abcde\r\n"] +test io-4.4 {TranslateOutputEOL: crlf} { + # keep storing more bytes in output buffer until output buffer is full. + # We have 13 bytes initially that would turn into 18 bytes. Fill + # dest buffer while (dstEnd < dstMax). + + set f [open test1 w] + fconfigure $f -translation crlf -buffersize 16 + puts -nonewline $f "1234567\n\n\n\n\nA" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "1234567\r\n\r\n\r\n\r\n\r" "1234567\r\n\r\n\r\n\r\n\r\nA"] + +test io-5.1 {CheckFlush: not full} { + set f [open test1 w] + fconfigure $f + puts -nonewline $f "12345678901234567890" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "" "12345678901234567890"] +test io-5.2 {CheckFlush: full} { + set f [open test1 w] + fconfigure $f -buffersize 16 + puts -nonewline $f "12345678901234567890" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "1234567890123456" "12345678901234567890"] +test io-5.3 {CheckFlush: not line} { + set f [open test1 w] + fconfigure $f -buffering line + puts -nonewline $f "12345678901234567890" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "" "12345678901234567890"] +test io-5.4 {CheckFlush: line} { + set f [open test1 w] + fconfigure $f -buffering line -translation lf -encoding ascii + puts -nonewline $f "1234567890\n1234567890" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "1234567890\n1234567890" "1234567890\n1234567890"] +test io-5.5 {CheckFlush: none} { + set f [open test1 w] + fconfigure $f -buffering none + puts -nonewline $f "1234567890" + set x [list [contents test1]] + close $f + lappend x [contents test1] +} [list "1234567890" "1234567890"] + +test io-6.1 {Tcl_GetsObj: working} { + set f [open test1 w] + puts $f "foo\nboo" + close $f + set f [open test1] + set x [gets $f] + close $f + set x +} {foo} +test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} { + # no test, need to cause an async error. +} {} +test io-6.3 {Tcl_GetsObj: how many have we used?} { + # if (bufPtr != NULL) {oldRemoved = bufPtr->nextRemoved} + + set f [open test1 w] + fconfigure $f -translation crlf + puts $f "abc\ndefg" + close $f + set f [open test1] + set x [list [tell $f] [gets $f line] [tell $f] [gets $f line] $line] + close $f + set x +} {0 3 5 4 defg} +test io-6.4 {Tcl_GetsObj: encoding == NULL} { + set f [open test1 w] + fconfigure $f -translation binary + puts $f "\x81\u1234\0" + close $f + set f [open test1] + fconfigure $f -translation binary + set x [list [gets $f line] $line] + close $f + set x +} [list 3 "\x81\x34\x00"] +test io-6.5 {Tcl_GetsObj: encoding != NULL} { + set f [open test1 w] + fconfigure $f -translation binary + puts $f "\x88\xea\x92\x9a" + close $f + set f [open test1] + fconfigure $f -encoding shiftjis + set x [list [gets $f line] $line] + close $f + set x +} [list 2 "\u4e00\u4e01"] +set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" +append a $a +append a $a +test io-6.6 {Tcl_GetsObj: loop test} { + # if (dst >= dstEnd) + + set f [open test1 w] + puts $f $a + puts $f hi + close $f + set f [open test1] + set x [list [gets $f line] $line] + close $f + set x +} [list 256 $a] +test io-6.7 {Tcl_GetsObj: error in input} {stdio} { + # if (FilterInputBytes(chanPtr, &gs) != 0) + + set f [open "|[list $tcltest cat]" w+] + puts -nonewline $f "hi\nwould" + flush $f + gets $f + fconfigure $f -blocking 0 + set x [gets $f line] + close $f + set x +} {-1} +test io-6.8 {Tcl_GetsObj: remember if EOF is seen} { + set f [open test1 w] + puts $f "abcdef\x1aghijk\nwombat" + close $f + set f [open test1] + fconfigure $f -eofchar \x1a + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {6 abcdef -1 {}} +test io-6.9 {Tcl_GetsObj: remember if EOF is seen} { + set f [open test1 w] + puts $f "abcdefghijk\nwom\u001abat" + close $f + set f [open test1] + fconfigure $f -eofchar \x1a + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {11 abcdefghijk 3 wom} + +# Comprehensive tests + +test io-6.10 {Tcl_GetsObj: lf mode: no chars} { + set f [open test1 w] + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line] + close $f + set x +} {-1 {}} +test io-6.11 {Tcl_GetsObj: lf mode: lone \n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\n" + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {0 {} -1 {}} +test io-6.12 {Tcl_GetsObj: lf mode: lone \r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r" + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 1 "\r" -1 ""] +test io-6.13 {Tcl_GetsObj: lf mode: 1 char} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f a + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.14 {Tcl_GetsObj: lf mode: 1 char followed by EOL} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "a\n" + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.15 {Tcl_GetsObj: lf mode: several chars} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" + close $f + set f [open test1] + fconfigure $f -translation lf + set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 4 "abcd" 10 "efgh\rijkl\r" 4 "mnop" -1 ""] +test io-6.16 {Tcl_GetsObj: cr mode: no chars} { + set f [open test1 w] + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line] + close $f + set x +} {-1 {}} +test io-6.17 {Tcl_GetsObj: cr mode: lone \n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\n" + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 1 "\n" -1 ""] +test io-6.18 {Tcl_GetsObj: cr mode: lone \r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r" + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {0 {} -1 {}} +test io-6.19 {Tcl_GetsObj: cr mode: 1 char} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f a + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.20 {Tcl_GetsObj: cr mode: 1 char followed by EOL} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "a\r" + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.21 {Tcl_GetsObj: cr mode: several chars} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" + close $f + set f [open test1] + fconfigure $f -translation cr + set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 9 "abcd\nefgh" 4 "ijkl" 5 "\nmnop" -1 ""] +test io-6.22 {Tcl_GetsObj: crlf mode: no chars} { + set f [open test1 w] + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line] + close $f + set x +} {-1 {}} +test io-6.23 {Tcl_GetsObj: crlf mode: lone \n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\n" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 1 "\n" -1 ""] +test io-6.24 {Tcl_GetsObj: crlf mode: lone \r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 1 "\r" -1 ""] +test io-6.25 {Tcl_GetsObj: crlf mode: \r\r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r\r" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 2 "\r\r" -1 ""] +test io-6.26 {Tcl_GetsObj: crlf mode: \r\n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r\n" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 0 "" -1 ""] +test io-6.27 {Tcl_GetsObj: crlf mode: 1 char} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f a + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.28 {Tcl_GetsObj: crlf mode: 1 char followed by EOL} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "a\r\n" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.29 {Tcl_GetsObj: crlf mode: several chars} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 14 "abcd\nefgh\rijkl" 4 "mnop" -1 ""] +test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} { + # if (eol >= dstEnd) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\r\nabcdefghijklmnoprstuvwxyz" + close $f + set f [open test1] + fconfigure $f -translation crlf -buffersize 16 + set x [list [gets $f line] $line [testchannel inputbuffered $f]] + close $f + set x +} [list 15 "123456789012345" 15] +test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio} { + # (FilterInputBytes() != 0) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {crlf lf} -buffering none + puts -nonewline $f "bbbbbbbbbbbbbb\r\n123456789012345\r" + fconfigure $f -buffersize 16 + set x [gets $f] + fconfigure $f -blocking 0 + lappend x [gets $f line] $line [fblocked $f] [testchannel inputbuffered $f] + close $f + set x +} [list "bbbbbbbbbbbbbb" -1 "" 1 16] +test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} { + # not (FilterInputBytes() != 0) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\r\n123" + close $f + set f [open test1] + fconfigure $f -translation crlf -buffersize 16 + set x [list [gets $f line] $line [tell $f] [testchannel inputbuffered $f]] + close $f + set x +} [list 15 "123456789012345" 17 3] +test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} { + # eol still equals dstEnd + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\r" + close $f + set f [open test1] + fconfigure $f -translation crlf -buffersize 16 + set x [list [gets $f line] $line [eof $f]] + close $f + set x +} [list 16 "123456789012345\r" 1] +test io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} { + # not (*eol == '\n') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\rabcd\r\nefg" + close $f + set f [open test1] + fconfigure $f -translation crlf -buffersize 16 + set x [list [gets $f line] $line [tell $f]] + close $f + set x +} [list 20 "123456789012345\rabcd" 22] +test io-6.35 {Tcl_GetsObj: auto mode: no chars} { + set f [open test1 w] + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line] + close $f + set x +} {-1 {}} +test io-6.36 {Tcl_GetsObj: auto mode: lone \n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\n" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 0 "" -1 ""] +test io-6.37 {Tcl_GetsObj: auto mode: lone \r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 0 "" -1 ""] +test io-6.38 {Tcl_GetsObj: auto mode: \r\r} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r\r" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 0 "" 0 "" -1 ""] +test io-6.39 {Tcl_GetsObj: auto mode: \r\n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r\n" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 0 "" -1 ""] +test io-6.40 {Tcl_GetsObj: auto mode: 1 char} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f a + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.41 {Tcl_GetsObj: auto mode: 1 char followed by EOL} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "a\r\n" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + close $f + set x +} {1 a -1 {}} +test io-6.42 {Tcl_GetsObj: auto mode: several chars} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [gets $f line] $line [gets $f line] $line] + lappend x [gets $f line] $line [gets $f line] $line [gets $f line] $line + close $f + set x +} [list 4 "abcd" 4 "efgh" 4 "ijkl" 4 "mnop" -1 ""] +test io-6.43 {Tcl_GetsObj: input saw cr} {stdio} { + # if (chanPtr->flags & INPUT_SAW_CR) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto lf} -buffering none + puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" + fconfigure $f -buffersize 16 + set x [list [gets $f]] + fconfigure $f -blocking 0 + lappend x [gets $f line] $line [testchannel queuedcr $f] + fconfigure $f -blocking 1 + puts -nonewline $f "\nabcd\refg\x1a" + lappend x [gets $f line] $line [testchannel queuedcr $f] + lappend x [gets $f line] $line + 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} { + # not (*eol == '\n') + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto lf} -buffering none + puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" + fconfigure $f -buffersize 16 + set x [list [gets $f]] + fconfigure $f -blocking 0 + lappend x [gets $f line] $line [testchannel queuedcr $f] + fconfigure $f -blocking 1 + puts -nonewline $f "abcd\refg\x1a" + lappend x [gets $f line] $line [testchannel queuedcr $f] + lappend x [gets $f line] $line + 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} { + # Tcl_ExternalToUtf() + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto lf} -buffering none + fconfigure $f -encoding unicode + puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" + fconfigure $f -buffersize 16 + gets $f + fconfigure $f -blocking 0 + set x [list [gets $f line] $line [testchannel queuedcr $f]] + fconfigure $f -blocking 1 + puts -nonewline $f "\nabcd\refg" + lappend x [gets $f line] $line [testchannel queuedcr $f] + 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} { + # memmove() + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto lf} -buffering none + puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r" + fconfigure $f -buffersize 16 + gets $f + fconfigure $f -blocking 0 + set x [list [gets $f line] $line [testchannel queuedcr $f]] + fconfigure $f -blocking 1 + puts -nonewline $f "\n\x1a" + lappend x [gets $f line] $line [testchannel queuedcr $f] + close $f + set x +} [list 15 "123456789abcdef" 1 -1 "" 0] +test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} { + # (eol == dstEnd) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\r\nabcdefghijklmnopq" + close $f + set f [open test1] + fconfigure $f -translation auto -buffersize 16 + set x [list [gets $f] [testchannel inputbuffered $f]] + close $f + set x +} [list "123456789012345" 15] +test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} { + # PeekAhead() did not get any, so (eol >= dstEnd) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456789012345\r" + close $f + set f [open test1] + fconfigure $f -translation auto -buffersize 16 + set x [list [gets $f] [testchannel queuedcr $f]] + close $f + set x +} [list "123456789012345" 1] +test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} { + # if (*eol == '\n') {skip++} + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456\r\n78901" + close $f + set f [open test1] + set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] + close $f + set x +} [list "123456" 0 8 "78901"] +test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} { + # not (*eol == '\n') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456\r78901" + close $f + set f [open test1] + set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] + close $f + set x +} [list "123456" 0 7 "78901"] +test io-6.51 {Tcl_GetsObj: auto mode: \n} { + # else if (*eol == '\n') {goto gotoeol;} + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456\n78901" + close $f + set f [open test1] + set x [list [gets $f] [tell $f] [gets $f]] + close $f + set x +} [list "123456" 7 "78901"] +test io-6.52 {Tcl_GetsObj: saw EOF character} { + # if (eof != NULL) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "123456\x1ak9012345\r" + close $f + set f [open test1] + fconfigure $f -eofchar \x1a + set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]] + close $f + set x +} [list "123456" 0 6 ""] +test io-6.53 {Tcl_GetsObj: device EOF} { + # didn't produce any bytes + + set f [open test1 w] + close $f + set f [open test1] + set x [list [gets $f line] $line [eof $f]] + close $f + set x +} {-1 {} 1} +test io-6.54 {Tcl_GetsObj: device EOF} { + # got some bytes before EOF. + + set f [open test1 w] + puts -nonewline $f abc + close $f + set f [open test1] + set x [list [gets $f line] $line [eof $f]] + close $f + set x +} {3 abc 1} +test io-6.55 {Tcl_GetsObj: overconverted} { + # Tcl_ExternalToUtf(), make sure state updated + + set f [open test1 w] + fconfigure $f -encoding iso2022-jp + puts $f "there\u4e00ok\n\u4e01more bytes\nhere" + close $f + set f [open test1] + fconfigure $f -encoding iso2022-jp + set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line] + close $f + set x +} [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"] +test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} { + update + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -buffering none + puts -nonewline $f "foobar" + fconfigure $f -blocking 0 + set x {} + after 500 { lappend x timeout } + fileevent $f readable { lappend x [gets $f] } + vwait x + vwait x + fconfigure $f -blocking 1 + puts -nonewline $f "baz\n" + after 500 { lappend x timeout } + fconfigure $f -blocking 0 + vwait x + vwait x + close $f + set x +} {{} timeout foobarbaz timeout} + +test io-7.1 {FilterInputBytes: split up character at end of buffer} { + # (result == TCL_CONVERT_MULTIBYTE) + + set f [open test1 w] + fconfigure $f -encoding shiftjis + puts $f "1234567890123\uff10\uff11\uff12\uff13\uff14\nend" + close $f + set f [open test1] + fconfigure $f -encoding shiftjis -buffersize 16 + set x [gets $f] + close $f + set x +} "1234567890123\uff10\uff11\uff12\uff13\uff14" +test io-7.2 {FilterInputBytes: split up character in middle of buffer} { + # (bufPtr->nextAdded < bufPtr->bufLength) + + set f [open test1 w] + fconfigure $f -encoding binary + puts -nonewline $f "1234567890\n123\x82\x4f\x82\x50\x82" + close $f + set f [open test1] + fconfigure $f -encoding shiftjis + set x [list [gets $f line] $line [eof $f]] + close $f + set x +} [list 10 "1234567890" 0] +test io-7.3 {FilterInputBytes: split up character at EOF} { + set f [open test1 w] + fconfigure $f -encoding binary + puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82" + close $f + set f [open test1] + fconfigure $f -encoding shiftjis + set x [list [gets $f line] $line] + lappend x [tell $f] [testchannel inputbuffered $f] [eof $f] + lappend x [gets $f line] $line + close $f + set x +} [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""] +test io-7.4 {FilterInputBytes: recover from split up character} {stdio} { + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -encoding binary -buffering none + puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82" + fconfigure $f -encoding shiftjis -blocking 0 + fileevent $f read "ready $f" + set x {} + proc ready {f} { + lappend ::x [gets $f line] $line [fblocked $f] + } + vwait x + fconfigure $f -encoding binary -blocking 1 + puts $f "\x51\x82\x52" + fconfigure $f -encoding shiftjis -blocking 0 + vwait x + close $f + set x +} [list -1 "" 1 17 "1234567890123\uff10\uff11\uff12\uff13" 0] + +test io-8.1 {PeekAhead: only go to device if no more cached data} { + # (bufPtr->nextPtr == NULL) + + set f [open "test1" w] + fconfigure $f -encoding ascii -translation lf + puts -nonewline $f "123456789012345\r\n2345678" + close $f + set f [open "test1"] + fconfigure $f -encoding ascii -translation auto -buffersize 16 + # here + gets $f + set x [testchannel inputbuffered $f] + close $f + set x +} "7" +test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio} { + # not (bufPtr->nextPtr == NULL) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation lf -encoding ascii -buffering none + puts -nonewline $f "123456789012345\r\nbcdefghijklmnopqrstuvwxyz" + set x {} + fileevent $f read "ready $f" + proc ready {f} { + lappend ::x [gets $f line] $line [testchannel inputbuffered $f] + } + fconfigure $f -encoding unicode -buffersize 16 -blocking 0 + vwait x + fconfigure $f -translation auto -encoding ascii -blocking 1 + # here + vwait x + close $f + set x +} [list -1 "" 42 15 "123456789012345" 25] +test io-8.3 {PeekAhead: no cached data available} {stdio} { + # (bytesLeft == 0) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto binary} + puts -nonewline $f "abcdefghijklmno\r" + flush $f + set x [list [gets $f line] $line [testchannel queuedcr $f]] + close $f + set x +} [list 15 "abcdefghijklmno" 1] +set a "123456789012345678901234567890" +append a "123456789012345678901234567890" +append a "1234567890123456789012345678901" +test io-8.4 {PeekAhead: cached data available in this buffer} { + # not (bytesLeft == 0) + + set f [open test1 w+] + fconfigure $f -translation binary + puts $f "${a}\r\nabcdef" + close $f + set f [open test1] + fconfigure $f -encoding binary -translation auto + + # "${a}\r" was converted in one operation (because ENCODING_LINESIZE + # is 30). To check if "\n" follows, calls PeekAhead and determines + # that cached data is available in buffer w/o having to call driver. + + set x [gets $f] + close $f + set x +} $a +unset a +test io-8.5 {PeekAhead: don't peek if last read was short} {stdio} { + # (bufPtr->nextAdded < bufPtr->length) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto binary} + puts -nonewline $f "abcdefghijklmno\r" + flush $f + # here + set x [list [gets $f line] $line [testchannel queuedcr $f]] + close $f + set x +} {15 abcdefghijklmno 1} +test io-8.6 {PeekAhead: change to non-blocking mode} {stdio} { + # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto binary} -buffersize 16 + puts -nonewline $f "abcdefghijklmno\r" + flush $f + # here + set x [list [gets $f line] $line [testchannel queuedcr $f]] + close $f + set x +} {15 abcdefghijklmno 1} +test io-8.7 {PeekAhead: cleanup} {stdio} { + # Make sure bytes are removed from buffer. + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -translation {auto binary} -buffering none + puts -nonewline $f "abcdefghijklmno\r" + # here + set x [list [gets $f line] $line [testchannel queuedcr $f]] + puts -nonewline $f "\x1a" + lappend x [gets $f line] $line + close $f + set x +} {15 abcdefghijklmno 1 -1 {}} + + +test io-9.1 {CommonGetsCleanup} { +} {} + +test io-10.1 {Tcl_ReadChars: CheckChannelErrors} { + # no test, need to cause an async error. +} {} +test io-10.2 {Tcl_ReadChars: loop until enough copied} { + # one time + # for (copied = 0; (unsigned) toRead > 0; ) + + set f [open "test1" w] + puts $f abcdefghijklmnop + close $f + + set f [open "test1"] + set x [read $f 5] + close $f + set x +} {abcde} +test io-10.3 {Tcl_ReadChars: loop until enough copied} { + # multiple times + # for (copied = 0; (unsigned) toRead > 0; ) + + set f [open "test1" w] + puts $f abcdefghijklmnopqrstuvwxyz + close $f + + set f [open "test1"] + fconfigure $f -buffersize 16 + # here + set x [read $f 19] + close $f + set x +} {abcdefghijklmnopqrs} +test io-10.4 {Tcl_ReadChars: no more in channel buffer} { + # (copiedNow < 0) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + + set f [open "test1"] + # here + set x [read $f 1000] + close $f + set x +} {abcdefghijkl} +test io-10.5 {Tcl_ReadChars: stop on EOF} { + # (chanPtr->flags & CHANNEL_EOF) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + + set f [open "test1"] + # here + set x [read $f 1000] + close $f + set x +} {abcdefghijkl} + +test io-11.1 {ReadBytes: want to read a lot} { + # ((unsigned) toRead > (unsigned) srcLen) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + set f [open "test1"] + fconfigure $f -encoding binary + # here + set x [read $f 1000] + close $f + set x +} {abcdefghijkl} +test io-11.2 {ReadBytes: want to read all} { + # ((unsigned) toRead > (unsigned) srcLen) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + set f [open "test1"] + fconfigure $f -encoding binary + # here + set x [read $f] + close $f + set x +} {abcdefghijkl} +test io-11.3 {ReadBytes: allocate more space} { + # (toRead > length - offset - 1) + + set f [open "test1" w] + puts -nonewline $f abcdefghijklmnopqrstuvwxyz + close $f + set f [open "test1"] + fconfigure $f -buffersize 16 -encoding binary + # here + set x [read $f] + close $f + set x +} {abcdefghijklmnopqrstuvwxyz} +test io-11.4 {ReadBytes: EOF char found} { + # (TranslateInputEOL() != 0) + + set f [open "test1" w] + puts $f abcdefghijklmnopqrstuvwxyz + close $f + set f [open "test1"] + fconfigure $f -eofchar m -encoding binary + # here + set x [list [read $f] [eof $f] [read $f] [eof $f]] + close $f + set x +} [list "abcdefghijkl" 1 "" 1] + +test io-12.1 {ReadChars: want to read a lot} { + # ((unsigned) toRead > (unsigned) srcLen) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + set f [open "test1"] + # here + set x [read $f 1000] + close $f + set x +} {abcdefghijkl} +test io-12.2 {ReadChars: want to read all} { + # ((unsigned) toRead > (unsigned) srcLen) + + set f [open "test1" w] + puts -nonewline $f abcdefghijkl + close $f + set f [open "test1"] + # here + set x [read $f] + close $f + set x +} {abcdefghijkl} +test io-12.3 {ReadChars: allocate more space} { + # (toRead > length - offset - 1) + + set f [open "test1" w] + puts -nonewline $f abcdefghijklmnopqrstuvwxyz + close $f + set f [open "test1"] + fconfigure $f -buffersize 16 + # here + set x [read $f] + close $f + set x +} {abcdefghijklmnopqrstuvwxyz} +test io-12.4 {ReadChars: split-up char} {stdio} { + # (srcRead == 0) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -encoding binary -buffering none -buffersize 16 + puts -nonewline $f "123456789012345\x96" + fconfigure $f -encoding shiftjis -blocking 0 + + fileevent $f read "ready $f" + proc ready {f} { + lappend ::x [read $f] [testchannel inputbuffered $f] + } + set x {} + + fconfigure $f -encoding shiftjis + vwait x + fconfigure $f -encoding binary -blocking 1 + puts -nonewline $f "\x7b" + fconfigure $f -encoding shiftjis -blocking 0 + vwait x + close $f + set x +} [list "123456789012345" 1 "\u672c" 0] +test io-12.5 {ReadChars: fileevents on partial characters} {stdio} { + set f [open test1 w] + puts $f { + fconfigure stdout -encoding binary -buffering none + gets stdin; puts -nonewline "\xe7" + gets stdin; puts -nonewline "\x89" + gets stdin; puts -nonewline "\xa6" + } + close $f + set f [open "|[list $tcltest test1]" r+] + fileevent $f readable { + lappend x [read $f] + if {[eof $f]} { + lappend x eof + } + } + puts $f "go1" + flush $f + fconfigure $f -blocking 0 -encoding utf-8 + set x {} + vwait x + after 500 { lappend x timeout } + vwait x + puts $f "go2" + flush $f + vwait x + after 500 { lappend x timeout } + vwait x + puts $f "go3" + flush $f + vwait x + vwait x + lappend x [catch {close $f} msg] $msg + set x +} "{} timeout {} timeout \u7266 {} eof 0 {}" + +test io-13.1 {TranslateInputEOL: cr mode} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\rdef\r" + close $f + set f [open test1] + fconfigure $f -translation cr + set x [read $f] + close $f + set x +} "abcd\ndef\n" +test io-13.2 {TranslateInputEOL: crlf mode} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r\ndef\r\n" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [read $f] + close $f + set x +} "abcd\ndef\n" +test io-13.3 {TranslateInputEOL: crlf mode: naked cr} { + # (src >= srcMax) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r\ndef\r" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [read $f] + close $f + set x +} "abcd\ndef\r" +test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} { + # (src >= srcMax) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r\ndef\rfgh" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [read $f] + close $f + set x +} "abcd\ndef\rfgh" +test io-13.5 {TranslateInputEOL: crlf mode: naked lf} { + # (src >= srcMax) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r\ndef\nfgh" + close $f + set f [open test1] + fconfigure $f -translation crlf + set x [read $f] + close $f + set x +} "abcd\ndef\nfgh" +test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio} { + # (chanPtr->flags & INPUT_SAW_CR) + + set f [open "|[list $tcltest cat]" w+] + fconfigure $f -blocking 0 -buffering none -translation {auto lf} + + fileevent $f read "ready $f" + proc ready {f} { + lappend ::x [read $f] [testchannel queuedcr $f] + } + set x {} + + puts -nonewline $f "abcdefghj\r" + vwait x + + puts -nonewline $f "\n01234" + vwait x + + close $f + set x +} [list "abcdefghj\n" 1 "01234" 0] +test io-13.7 {TranslateInputEOL: auto mode: naked \r} { + # (src >= srcMax) + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [list [read $f] [testchannel queuedcr $f]] + close $f + set x +} [list "abcd\n" 1] +test io-13.8 {TranslateInputEOL: auto mode: \r\n} { + # (*src == '\n') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\r\ndef" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [read $f] + close $f + set x +} "abcd\ndef" +test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} { + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\rdef" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [read $f] + close $f + set x +} "abcd\ndef" +test io-13.10 {TranslateInputEOL: auto mode: \n} { + # not (*src == '\r') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\ndef" + close $f + set f [open test1] + fconfigure $f -translation auto + set x [read $f] + close $f + set x +} "abcd\ndef" +test io-13.11 {TranslateInputEOL: EOF char} { + # (*chanPtr->inEofChar != '\0') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "abcd\ndefgh" + close $f + set f [open test1] + fconfigure $f -translation auto -eofchar e + set x [read $f] + close $f + set x +} "abcd\nd" +test io-13.12 {TranslateInputEOL: find EOF char in src} { + # (*chanPtr->inEofChar != '\0') + + set f [open test1 w] + fconfigure $f -translation lf + puts -nonewline $f "\r\n\r\n\r\nab\r\n\r\ndef\r\n\r\n\r\n" + close $f + set f [open test1] + fconfigure $f -translation auto -eofchar e + set x [read $f] + 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. @@ -133,7 +1555,7 @@ if {$tcl_platform(platform) == "macintosh"} { } else { set consoleFileNames [lsort [testchannel open]] } -test io-1.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} { +test io-14.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} { set l "" lappend l [fconfigure stdin -buffering] lappend l [fconfigure stdout -buffering] @@ -141,7 +1563,7 @@ test io-1.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} { lappend l [lsort [testchannel open]] set l } [list line line none $consoleFileNames] -test io-1.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} { +test io-14.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} { interp create x set l "" lappend l [x eval {fconfigure stdin -buffering}] @@ -150,7 +1572,7 @@ test io-1.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} { interp delete x set l } {line line none} -test io-1.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {stdio} { +test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {stdio} { set f [open test1 w] puts $f { close stdin @@ -179,7 +1601,7 @@ out } {err }} # This test relies on the fact that the smallest available fd is used first. -test io-1.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {unixOnly} { +test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {unixOnly} { set f [open test1 w] puts $f { close stdin close stdout @@ -207,7 +1629,7 @@ file1 } {file2 }} catch {interp delete z} -test io-1.5 {Tcl_GetChannel: stdio name translation} { +test io-14.5 {Tcl_GetChannel: stdio name translation} { interp create z eof stdin catch {z eval flush stdin} msg1 @@ -217,7 +1639,7 @@ test io-1.5 {Tcl_GetChannel: stdio name translation} { interp delete z set result } {{channel "stdin" wasn't opened for writing} {} {can not find channel named "stdin"}} -test io-1.6 {Tcl_GetChannel: stdio name translation} { +test io-14.6 {Tcl_GetChannel: stdio name translation} { interp create z eof stdout catch {z eval flush stdout} msg1 @@ -227,7 +1649,7 @@ test io-1.6 {Tcl_GetChannel: stdio name translation} { interp delete z set result } {{} {} {can not find channel named "stdout"}} -test io-1.7 {Tcl_GetChannel: stdio name translation} { +test io-14.7 {Tcl_GetChannel: stdio name translation} { interp create z eof stderr catch {z eval flush stderr} msg1 @@ -237,7 +1659,7 @@ test io-1.7 {Tcl_GetChannel: stdio name translation} { interp delete z set result } {{} {} {can not find channel named "stderr"}} -test io-1.8 {reuse of stdio special channels} {unixOnly} { +test io-14.8 {reuse of stdio special channels} {stdio} { removeFile script removeFile test1 set f [open script w] @@ -255,7 +1677,7 @@ test io-1.8 {reuse of stdio special channels} {unixOnly} { close $f set c } hello -test io-1.9 {reuse of stdio special channels} {stdio} { +test io-14.9 {reuse of stdio special channels} {stdio} { removeFile script removeFile test1 set f [open script w] @@ -274,8 +1696,11 @@ test io-1.9 {reuse of stdio special channels} {stdio} { set c } hello -# Must add test function for testing Tcl_CreateCloseHandler and -# Tcl_DeleteCloseHandler. +test io-15.1 {Tcl_CreateCloseHandler} { +} {} + +test io-16.1 {Tcl_DeleteCloseHandler} { +} {} # Test channel table management. The functions tested are # GetChannelTable, DeleteChannelTable, Tcl_RegisterChannel, @@ -284,7 +1709,7 @@ test io-1.9 {reuse of stdio special channels} {stdio} { # These functions use "eof stdin" to ensure that the standard # channels are added to the channel table of the interpreter. -test io-2.1 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.1 {GetChannelTable, DeleteChannelTable on std handles} { set l1 [testchannel refcount stdin] eof stdin interp create x @@ -296,7 +1721,7 @@ test io-2.1 {GetChannelTable, DeleteChannelTable on std handles} { lappend l [expr [testchannel refcount stdin] - $l1] set l } {0 1 0} -test io-2.2 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.2 {GetChannelTable, DeleteChannelTable on std handles} { set l1 [testchannel refcount stdout] eof stdin interp create x @@ -308,7 +1733,7 @@ test io-2.2 {GetChannelTable, DeleteChannelTable on std handles} { lappend l [expr [testchannel refcount stdout] - $l1] set l } {0 1 0} -test io-2.3 {GetChannelTable, DeleteChannelTable on std handles} { +test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} { set l1 [testchannel refcount stderr] eof stdin interp create x @@ -320,7 +1745,8 @@ test io-2.3 {GetChannelTable, DeleteChannelTable on std handles} { lappend l [expr [testchannel refcount stderr] - $l1] set l } {0 1 0} -test io-2.4 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { + +test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { removeFile test1 set l "" set f [open test1 w] @@ -334,7 +1760,7 @@ test io-2.4 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { string compare [string tolower $l] \ [list 1 [format "can not find channel named \"%s\"" $f]] } 0 -test io-2.5 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { +test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { removeFile test1 set l "" set f [open test1 w] @@ -355,7 +1781,7 @@ test io-2.5 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { string compare [string tolower $l] \ [list 1 2 1 1 [format "can not find channel named \"%s\"" $f]] } 0 -test io-2.6 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { +test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { removeFile test1 set l "" set f [open test1 w] @@ -374,20 +1800,21 @@ test io-2.6 {Tcl_RegisterChannel, Tcl_UnregisterChannel} { string compare [string tolower $l] \ [list 1 2 1 [format "can not find channel named \"%s\"" $f]] } 0 -test io-2.7 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} { + +test io-19.1 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} { eof stdin } 0 -test io-2.8 {testing Tcl_GetChannel, user opened handle} { +test io-19.2 {testing Tcl_GetChannel, user opened handle} { removeFile test1 set f [open test1 w] set x [eof $f] close $f set x } 0 -test io-2.9 {Tcl_GetChannel, channel not found} { +test io-19.3 {Tcl_GetChannel, channel not found} { list [catch {eof file34} msg] $msg } {1 {can not find channel named "file34"}} -test io-2.10 {Tcl_CreateChannel, insertion into channel table} { +test io-19.4 {Tcl_CreateChannel, insertion into channel table} { removeFile test1 set f [open test1 w] set l "" @@ -402,27 +1829,79 @@ test io-2.10 {Tcl_CreateChannel, insertion into channel table} { [list 0 [format "can not find channel named \"%s\"" $f]] } 0 +test io-20.1 {Tcl_CreateChannel: initial settings} { + set a [open test2 w] + set old [testencoding system] + testencoding system ascii + set f [open test1 w] + set x [fconfigure $f -encoding] + close $f + testencoding system $old + close $a + set x +} {ascii} +test io-20.2 {Tcl_CreateChannel: initial settings} {pc} { + set f [open 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} {unix} { + set f [open 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} {mac} { + set f [open test1 w+] + set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] + close $f + set x +} {{{} {}} {auto cr}} +test io-20.5 {Tcl_CreateChannel: install channel in empty slot} {stdio} { + set f [open script w] + puts $f { + close stdout + set f1 [open stdout w] + fconfigure $f1 -buffersize 777 + puts stderr [fconfigure stdout -buffersize] + } + close $f + set f [open "|[list $tcltest script]"] + catch {close $f} msg + set msg +} {777} + +test io-21.1 {CloseChannelsOnExit} { +} {} + # 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-3.1 {Tcl_GetChannelName} { +test io-22.1 {Tcl_GetChannelMode} { + # Not used anywhere in Tcl. +} {} + +test io-23.1 {Tcl_GetChannelName} { removeFile test1 set f [open test1 w] set n [testchannel name $f] close $f string compare $n $f } 0 -test io-3.2 {Tcl_GetChannelType} { + +test io-24.1 {Tcl_GetChannelType} { removeFile test1 set f [open test1 w] set t [testchannel type $f] close $f string compare $t file } 0 -test io-3.3 {Tcl_GetChannelFile, input} { + +test io-25.1 {Tcl_GetChannelHandle, input} { set f [open test1 w] fconfigure $f -translation lf -eofchar {} puts $f "1234567890\n098765432" @@ -435,7 +1914,7 @@ test io-3.3 {Tcl_GetChannelFile, input} { close $f set l } {10 11} -test io-3.4 {Tcl_GetChannelFile, output} { +test io-25.2 {Tcl_GetChannelHandle, output} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -451,9 +1930,18 @@ test io-3.4 {Tcl_GetChannelFile, output} { set l } {6 6 0 6} +test io-26.1 {Tcl_GetChannelInstanceData} {stdio} { + # "pid" command uses Tcl_GetChannelInstanceData + # Don't care what pid is (but must be a number), just want to exercise it. + + set f [open "|[list $tcltest << exit]"] + expr [pid $f] + close $f +} {} + # Test flushing. The functions tested here are FlushChannel. -test io-4.1 {FlushChannel, no output buffered} { +test io-27.1 {FlushChannel, no output buffered} { removeFile test1 set f [open test1 w] flush $f @@ -461,7 +1949,7 @@ test io-4.1 {FlushChannel, no output buffered} { close $f set s } 0 -test io-4.2 {FlushChannel, some output buffered} { +test io-27.2 {FlushChannel, some output buffered} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -474,7 +1962,7 @@ test io-4.2 {FlushChannel, some output buffered} { lappend l [file size test1] set l } {0 6 6} -test io-4.3 {FlushChannel, implicit flush on close} { +test io-27.3 {FlushChannel, implicit flush on close} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -485,7 +1973,7 @@ test io-4.3 {FlushChannel, implicit flush on close} { lappend l [file size test1] set l } {0 6} -test io-4.4 {FlushChannel, implicit flush when buffer fills} { +test io-27.4 {FlushChannel, implicit flush when buffer fills} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -501,7 +1989,7 @@ test io-4.4 {FlushChannel, implicit flush when buffer fills} { close $f set l } {0 60 72} -test io-4.5 {FlushChannel, implicit flush when buffer fills and on close} {unixOrPc} { +test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} {unixOrPc} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffersize 60 -eofchar {} @@ -515,7 +2003,7 @@ test io-4.5 {FlushChannel, implicit flush when buffer fills and on close} {unixO lappend l [file size test1] set l } {0 60 72} -test io-4.6 {FlushChannel, async flushing, async close} {stdio && asyncPipeClose} { +test io-27.6 {FlushChannel, async flushing, async close} {stdio && asyncPipeClose} { removeFile pipe removeFile output set f [open pipe w] @@ -546,7 +2034,7 @@ test io-4.6 {FlushChannel, async flushing, async close} {stdio && asyncPipeClose update } if {$counter == 1000} { - set result probably_broken + set result "file size only [file size output]" } else { set result ok } @@ -554,7 +2042,7 @@ test io-4.6 {FlushChannel, async flushing, async close} {stdio && asyncPipeClose # Tests closing a channel. The functions tested are CloseChannel and Tcl_Close. -test io-5.1 {CloseChannel called when all references are dropped} { +test io-28.1 {CloseChannel called when all references are dropped} { removeFile test1 set f [open test1 w] interp create x @@ -567,7 +2055,7 @@ test io-5.1 {CloseChannel called when all references are dropped} { close $f set l } {2 1} -test io-5.2 {CloseChannel called when all references are dropped} { +test io-28.2 {CloseChannel called when all references are dropped} { removeFile test1 set f [open test1 w] interp create x @@ -582,7 +2070,7 @@ test io-5.2 {CloseChannel called when all references are dropped} { close $f set l } abcdef -test io-5.3 {CloseChannel, not called before output queue is empty} {unixOrPc asyncPipeClose nonPortable tempNotPc} { +test io-28.3 {CloseChannel, not called before output queue is empty} {stdio asyncPipeClose nonPortable} { removeFile pipe removeFile output set f [open pipe w] @@ -613,9 +2101,6 @@ test io-5.3 {CloseChannel, not called before output queue is empty} {unixOrPc as set f [open "|[list $tcltest pipe]" r+] fconfigure $f -blocking off -eofchar {} - # Under windows, the first 24576 bytes of $x are copied to $f, and - # then the writing fails. - puts -nonewline $f $x close $f set counter 0 @@ -630,7 +2115,7 @@ test io-5.3 {CloseChannel, not called before output queue is empty} {unixOrPc as set result ok } } ok -test io-5.4 {Tcl_Close} { +test io-28.4 {Tcl_Close} { removeFile test1 set l "" lappend l [lsort [testchannel open]] @@ -643,7 +2128,7 @@ test io-5.4 {Tcl_Close} { $consoleFileNames] string compare $l $x } 0 -test io-5.5 {Tcl_Close vs standard handles} {unixOnly} { +test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly} { removeFile script set f [open script w] puts $f { @@ -657,13 +2142,10 @@ test io-5.5 {Tcl_Close vs standard handles} {unixOnly} { set l } {file1 file2} -# Test output on channels. The functions tested are Tcl_Write -# and Tcl_Flush. - -test io-6.1 {Tcl_Write, channel not writable} { +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-6.2 {Tcl_Write, empty string} { +test io-29.2 {Tcl_WriteChars, empty string} { removeFile test1 set f [open test1 w] fconfigure $f -eofchar {} @@ -671,7 +2153,7 @@ test io-6.2 {Tcl_Write, empty string} { close $f file size test1 } 0 -test io-6.3 {Tcl_Write, nonempty string} { +test io-29.3 {Tcl_WriteChars, nonempty string} { removeFile test1 set f [open test1 w] fconfigure $f -eofchar {} @@ -679,7 +2161,7 @@ test io-6.3 {Tcl_Write, nonempty string} { close $f file size test1 } 5 -test io-6.4 {Tcl_Write, buffering in full buffering mode} { +test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffering full -eofchar {} @@ -693,7 +2175,7 @@ test io-6.4 {Tcl_Write, buffering in full buffering mode} { close $f set l } {6 0 0 6} -test io-6.5 {Tcl_Write, buffering in line buffering mode} { +test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffering line -eofchar {} @@ -707,7 +2189,7 @@ test io-6.5 {Tcl_Write, buffering in line buffering mode} { close $f set l } {5 0 0 11} -test io-6.6 {Tcl_Write, buffering in no buffering mode} { +test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffering none -eofchar {} @@ -721,7 +2203,8 @@ test io-6.6 {Tcl_Write, buffering in no buffering mode} { close $f set l } {0 5 0 11} -test io-6.7 {Tcl_Flush, full buffering} { + +test io-29.7 {Tcl_Flush, full buffering} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffering full -eofchar {} @@ -738,7 +2221,7 @@ test io-6.7 {Tcl_Flush, full buffering} { close $f set l } {5 0 11 0 0 11} -test io-6.8 {Tcl_Flush, full buffering} { +test io-29.8 {Tcl_Flush, full buffering} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -buffering line @@ -758,34 +2241,34 @@ test io-6.8 {Tcl_Flush, full buffering} { close $f set l } {5 0 0 5 0 11 0 11} -test io-6.9 {Tcl_Flush, channel not writable} { +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-6.10 {Tcl_Write, looping and buffering} { +test io-29.10 {Tcl_WriteChars, looping and buffering} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} set f2 [open longfile r] for {set x 0} {$x < 10} {incr x} { - puts $f1 [gets $f2] + puts $f1 [gets $f2] } close $f2 close $f1 file size test1 } 387 -test io-6.11 {Tcl_Write, no newline, implicit flush} { +test io-29.11 {Tcl_WriteChars, no newline, implicit flush} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -eofchar {} set f2 [open longfile r] for {set x 0} {$x < 10} {incr x} { - puts -nonewline $f1 [gets $f2] + puts -nonewline $f1 [gets $f2] } close $f1 close $f2 file size test1 } 377 -test io-6.12 {Tcl_Write on a pipe} {stdio} { +test io-29.12 {Tcl_WriteChars on a pipe} {stdio} { removeFile test1 removeFile pipe set f1 [open pipe w] @@ -800,17 +2283,17 @@ test io-6.12 {Tcl_Write on a pipe} {stdio} { set f2 [open longfile r] set y ok for {set x 0} {$x < 10} {incr x} { - set l1 [gets $f1] - set l2 [gets $f2] - if {"$l1" != "$l2"} { - set y broken - } + set l1 [gets $f1] + set l2 [gets $f2] + if {"$l1" != "$l2"} { + set y broken + } } close $f1 close $f2 set y } ok -test io-6.13 {Tcl_Write to a pipe, line buffered} {stdio} { +test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} { removeFile test1 removeFile pipe set f1 [open pipe w] @@ -827,19 +2310,19 @@ test io-6.13 {Tcl_Write to a pipe, line buffered} {stdio} { puts $f1 $line set backline [gets $f1] if {"$line" != "$backline"} { - set y broken + set y broken } set line [gets $f2] puts $f1 $line set backline [gets $f1] if {"$line" != "$backline"} { - set y broken + set y broken } close $f1 close $f2 set y } ok -test io-6.14 {Tcl_Write, buffering and implicit flush at close} { +test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} { removeFile test3 set f [open test3 w] puts -nonewline $f "Text1" @@ -851,7 +2334,7 @@ test io-6.14 {Tcl_Write, buffering and implicit flush at close} { close $f set x } {Text1 Text 2 Text 3} -test io-6.15 {Tcl_Flush, channel not open for writing} { +test io-29.15 {Tcl_Flush, channel not open for writing} { removeFile test1 set fd [open test1 w] close $fd @@ -861,14 +2344,14 @@ test io-6.15 {Tcl_Flush, channel not open for writing} { string compare $x \ [list 1 "channel \"$fd\" wasn't opened for writing"] } 0 -test io-6.16 {Tcl_Flush on pipe opened only for reading} {stdio} { +test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio} { set fd [open "|[list $tcltest cat longfile]" r] set x [list [catch {flush $fd} msg] $msg] catch {close $fd} string compare $x \ [list 1 "channel \"$fd\" wasn't opened for writing"] } 0 -test io-6.17 {Tcl_Write buffers, then Tcl_Flush flushes} { +test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf @@ -880,7 +2363,7 @@ test io-6.17 {Tcl_Write buffers, then Tcl_Flush flushes} { close $f1 set x } 18 -test io-6.18 {Tcl_Write and Tcl_Flush intermixed} { +test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} { removeFile test1 set x "" set f1 [open test1 w] @@ -899,7 +2382,7 @@ test io-6.18 {Tcl_Write and Tcl_Flush intermixed} { close $f1 set x } {18 24 30} -test io-6.19 {Explicit and implicit flushes} { +test io-29.19 {Explicit and implicit flushes} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -917,7 +2400,7 @@ test io-6.19 {Explicit and implicit flushes} { lappend x [file size test1] set x } {18 24 30} -test io-6.20 {Implicit flush when buffer is full} { +test io-29.20 {Implicit flush when buffer is full} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -928,14 +2411,14 @@ test io-6.20 {Implicit flush when buffer is full} { set z "" lappend z [file size test1] for {set x 0} {$x < 100} {incr x} { - puts $f1 $line + puts $f1 $line } lappend z [file size test1] close $f1 lappend z [file size test1] set z } {4096 12288 12600} -test io-6.21 {Tcl_Flush to pipe} {stdio} { +test io-29.21 {Tcl_Flush to pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {set x [read stdin 6]} @@ -949,7 +2432,7 @@ test io-6.21 {Tcl_Flush to pipe} {stdio} { catch {close $f1} set x } "read 6 characters" -test io-6.22 {Tcl_Flush called at other end of pipe} {stdio} { +test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 { @@ -972,7 +2455,7 @@ test io-6.22 {Tcl_Flush called at other end of pipe} {stdio} { close $f1 set x } {hello hello bye} -test io-6.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { +test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 { @@ -992,7 +2475,7 @@ test io-6.23 {Tcl_Flush and line buffering at end of pipe} {stdio} { close $f1 set x } {hello hello bye} -test io-6.24 {Tcl_Write and Tcl_Flush move end of file} { +test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} { set f [open test3 w] puts $f "Line 1" puts $f "Line 2" @@ -1006,9 +2489,8 @@ test io-6.24 {Tcl_Write and Tcl_Flush move end of file} { close $f2 close $f set x -} {{} {Line 1 -Line 2}} -test io-6.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { +} "{} {Line 1\nLine 2}" +test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { removeFile test3 set f [open "|[list $tcltest cat | $tcltest cat > test3]" w] puts $f "Line 1" @@ -1019,10 +2501,8 @@ test io-6.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} { set x [read $f] close $f set x -} {Line 1 -Line 2 -} -test io-6.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {unixOrPc && unixExecs && tempNotPc} { +} "Line 1\nLine 2\n" +test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio && unixExecs} { set f [open "|[list cat -u]" r+] puts $f "Line1" flush $f @@ -1030,7 +2510,7 @@ test io-6.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {unixOrPc && unix close $f set x } {Line1} -test io-6.27 {Tcl_Flush on closed pipeline} {stdio && tempNotPc} { +test io-29.27 {Tcl_Flush on closed pipeline} {stdio} { removeFile pipe set f [open pipe w] puts $f {exit} @@ -1058,7 +2538,7 @@ test io-6.27 {Tcl_Flush on closed pipeline} {stdio && tempNotPc} { regsub {".*":} $x {"":} x string tolower $x } {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}} -test io-6.28 {Tcl_Write, lf mode} { +test io-29.28 {Tcl_WriteChars, lf mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -1068,7 +2548,7 @@ test io-6.28 {Tcl_Write, lf mode} { close $f set s } 21 -test io-6.29 {Tcl_Write, cr mode} { +test io-29.29 {Tcl_WriteChars, cr mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -1076,7 +2556,7 @@ test io-6.29 {Tcl_Write, cr mode} { close $f file size test1 } 21 -test io-6.30 {Tcl_Write, crlf mode} { +test io-29.30 {Tcl_WriteChars, crlf mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -1084,7 +2564,7 @@ test io-6.30 {Tcl_Write, crlf mode} { close $f file size test1 } 25 -test io-6.31 {Tcl_Write, background flush} {stdio} { +test io-29.31 {Tcl_WriteChars, background flush} {stdio} { removeFile pipe removeFile output set f [open pipe w] @@ -1100,7 +2580,7 @@ test io-6.31 {Tcl_Write, background flush} {stdio} { close $f set x 01234567890123456789012345678901 for {set i 0} {$i < 11} {incr i} { - set x "$x$x" + set x "$x$x" } set f [open output w] close $f @@ -1110,17 +2590,17 @@ test io-6.31 {Tcl_Write, background flush} {stdio} { close $f set counter 0 while {([file size output] < 65536) && ($counter < 1000)} { - incr counter - after 5 - update + incr counter + after 5 + update } if {$counter == 1000} { - set result probably_broken + set result "file size only [file size output]" } else { - set result ok + set result ok } } ok -test io-6.32 {Tcl_Write, background flush to slow reader} {stdio && asyncPipeClose} { +test io-29.32 {Tcl_WriteChars, background flush to slow reader} {stdio && asyncPipeClose} { removeFile pipe removeFile output set f [open pipe w] @@ -1137,7 +2617,7 @@ test io-6.32 {Tcl_Write, background flush to slow reader} {stdio && asyncPipeClo close $f set x 01234567890123456789012345678901 for {set i 0} {$i < 11} {incr i} { - set x "$x$x" + set x "$x$x" } set f [open output w] close $f @@ -1147,17 +2627,17 @@ test io-6.32 {Tcl_Write, background flush to slow reader} {stdio && asyncPipeClo close $f set counter 0 while {([file size output] < 65536) && ($counter < 1000)} { - incr counter - after 20 - update + incr counter + after 20 + update } if {$counter == 1000} { - set result probably_broken + set result "file size only [file size output]" } else { - set result ok + set result ok } } ok -test io-6.33 {Tcl_Flush, implicit flush on exit} {stdio} { +test io-29.33 {Tcl_Flush, implicit flush on exit} {stdio} { set f [open script w] puts $f { set f [open test1 w] @@ -1172,12 +2652,8 @@ test io-6.33 {Tcl_Flush, implicit flush on exit} {stdio} { set r [read $f] close $f set r -} {hello -bye -strange -} - -test io-6.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac} { +} "hello\nbye\nstrange\n" +test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac} { set c 0 set x running set l abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz @@ -1213,7 +2689,10 @@ test io-6.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac vwait x set c } 2000 -test io-6.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket} { +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 + # either cause errors or panic(). + catch {interp delete x} catch {interp delete y} interp create x @@ -1254,7 +2733,7 @@ test io-6.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket} { # Test end of line translations. Procedures tested are Tcl_Write, Tcl_Read. -test io-7.1 {Tcl_Write lf, Tcl_Read lf} { +test io-30.1 {Tcl_Write lf, Tcl_Read lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1266,7 +2745,7 @@ test io-7.1 {Tcl_Write lf, Tcl_Read lf} { close $f set x } "hello\nthere\nand\nhere\n" -test io-7.2 {Tcl_Write lf, Tcl_Read cr} { +test io-30.2 {Tcl_Write lf, Tcl_Read cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1278,7 +2757,7 @@ test io-7.2 {Tcl_Write lf, Tcl_Read cr} { close $f set x } "hello\nthere\nand\nhere\n" -test io-7.3 {Tcl_Write lf, Tcl_Read crlf} { +test io-30.3 {Tcl_Write lf, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1290,7 +2769,7 @@ test io-7.3 {Tcl_Write lf, Tcl_Read crlf} { close $f set x } "hello\nthere\nand\nhere\n" -test io-7.4 {Tcl_Write cr, Tcl_Read cr} { +test io-30.4 {Tcl_Write cr, Tcl_Read cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1302,7 +2781,7 @@ test io-7.4 {Tcl_Write cr, Tcl_Read cr} { close $f set x } "hello\nthere\nand\nhere\n" -test io-7.5 {Tcl_Write cr, Tcl_Read lf} { +test io-30.5 {Tcl_Write cr, Tcl_Read lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1314,7 +2793,7 @@ test io-7.5 {Tcl_Write cr, Tcl_Read lf} { close $f set x } "hello\rthere\rand\rhere\r" -test io-7.6 {Tcl_Write cr, Tcl_Read crlf} { +test io-30.6 {Tcl_Write cr, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1326,7 +2805,7 @@ test io-7.6 {Tcl_Write cr, Tcl_Read crlf} { close $f set x } "hello\rthere\rand\rhere\r" -test io-7.7 {Tcl_Write crlf, Tcl_Read crlf} { +test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1338,7 +2817,7 @@ test io-7.7 {Tcl_Write crlf, Tcl_Read crlf} { close $f set x } "hello\nthere\nand\nhere\n" -test io-7.8 {Tcl_Write crlf, Tcl_Read lf} { +test io-30.8 {Tcl_Write crlf, Tcl_Read lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1350,7 +2829,7 @@ test io-7.8 {Tcl_Write crlf, Tcl_Read lf} { close $f set x } "hello\r\nthere\r\nand\r\nhere\r\n" -test io-7.9 {Tcl_Write crlf, Tcl_Read cr} { +test io-30.9 {Tcl_Write crlf, Tcl_Read cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1362,7 +2841,7 @@ test io-7.9 {Tcl_Write crlf, Tcl_Read cr} { close $f set x } "hello\n\nthere\n\nand\n\nhere\n\n" -test io-7.10 {Tcl_Write lf, Tcl_Read auto} { +test io-30.10 {Tcl_Write lf, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1378,7 +2857,7 @@ there and here } auto} -test io-7.11 {Tcl_Write cr, Tcl_Read auto} { +test io-30.11 {Tcl_Write cr, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1394,7 +2873,7 @@ there and here } auto} -test io-7.12 {Tcl_Write crlf, Tcl_Read auto} { +test io-30.12 {Tcl_Write crlf, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1411,7 +2890,7 @@ and here } auto} -test io-7.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { +test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1428,7 +2907,7 @@ test io-7.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} { string length $c } [expr 700*15+1] -test io-7.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { +test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1445,7 +2924,7 @@ test io-7.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} { string length $c } [expr 700*15+1] -test io-7.15 {Tcl_Write mixed, Tcl_Read auto} { +test io-30.15 {Tcl_Write mixed, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1461,7 +2940,7 @@ there and here } -test io-7.16 {Tcl_Write ^Z at end, Tcl_Read auto} { +test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1477,7 +2956,7 @@ there and here } -test io-7.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} { +test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} { removeFile test1 set f [open test1 w] fconfigure $f -eofchar \x1a -translation lf @@ -1493,7 +2972,7 @@ there and here } -test io-7.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { +test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1513,7 +2992,7 @@ test io-7.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} { close $f set l } {abc def 0 {} 1 {} 1} -test io-7.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { +test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1533,7 +3012,7 @@ test io-7.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} { close $f set l } {abc def 0 {} 1 {} 1} -test io-7.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { +test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -1555,7 +3034,7 @@ test io-7.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} { close $f set l } "abc def 0 \x1aghi 0 qrs 0 {} 1" -test io-7.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { +test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -1566,14 +3045,14 @@ test io-7.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} { fconfigure $f -translation cr -eofchar {} set l "" set x [gets $f] - lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs"] + lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs\n"] lappend l [eof $f] lappend l [gets $f] lappend l [eof $f] close $f set l } {0 1 {} 1} -test io-7.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { +test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -1584,14 +3063,14 @@ test io-7.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} { fconfigure $f -translation crlf -eofchar {} set l "" set x [gets $f] - lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs"] + lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs\n"] lappend l [eof $f] lappend l [gets $f] lappend l [eof $f] close $f set l } {0 1 {} 1} -test io-7.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { +test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1605,7 +3084,7 @@ test io-7.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} { close $f list $c $e } {8 1} -test io-7.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { +test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1619,7 +3098,7 @@ test io-7.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} { close $f list $c $e } {8 1} -test io-7.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { +test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1633,7 +3112,7 @@ test io-7.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} { close $f list $c $e } {8 1} -test io-7.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { +test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1647,7 +3126,7 @@ test io-7.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} { close $f list $c $e } {8 1} -test io-7.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { +test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1661,7 +3140,7 @@ test io-7.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} { close $f list $c $e } {8 1} -test io-7.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { +test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1678,7 +3157,7 @@ test io-7.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-8.1 {Tcl_Write lf, Tcl_Gets auto} { +test io-31.1 {Tcl_Write lf, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1695,7 +3174,7 @@ test io-8.1 {Tcl_Write lf, Tcl_Gets auto} { close $f set l } {hello 6 auto there 12 auto} -test io-8.2 {Tcl_Write cr, Tcl_Gets auto} { +test io-31.2 {Tcl_Write cr, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1712,7 +3191,7 @@ test io-8.2 {Tcl_Write cr, Tcl_Gets auto} { close $f set l } {hello 6 auto there 12 auto} -test io-8.3 {Tcl_Write crlf, Tcl_Gets auto} { +test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1729,7 +3208,7 @@ test io-8.3 {Tcl_Write crlf, Tcl_Gets auto} { close $f set l } {hello 7 auto there 14 auto} -test io-8.4 {Tcl_Write lf, Tcl_Gets lf} { +test io-31.4 {Tcl_Write lf, Tcl_Gets lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1747,7 +3226,7 @@ test io-8.4 {Tcl_Write lf, Tcl_Gets lf} { close $f set l } {hello 6 lf there 12 lf} -test io-8.5 {Tcl_Write lf, Tcl_Gets cr} { +test io-31.5 {Tcl_Write lf, Tcl_Gets cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1766,8 +3245,8 @@ test io-8.5 {Tcl_Write lf, Tcl_Gets cr} { lappend l [eof $f] close $f set l -} {20 21 cr 1 {} 21 cr 1} -test io-8.6 {Tcl_Write lf, Tcl_Gets crlf} { +} {21 21 cr 1 {} 21 cr 1} +test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1786,8 +3265,8 @@ test io-8.6 {Tcl_Write lf, Tcl_Gets crlf} { lappend l [eof $f] close $f set l -} {20 21 crlf 1 {} 21 crlf 1} -test io-8.7 {Tcl_Write cr, Tcl_Gets cr} { +} {21 21 crlf 1 {} 21 crlf 1} +test io-31.7 {Tcl_Write cr, Tcl_Gets cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1807,7 +3286,7 @@ test io-8.7 {Tcl_Write cr, Tcl_Gets cr} { close $f set l } {hello 6 cr 0 there 12 cr 0} -test io-8.8 {Tcl_Write cr, Tcl_Gets lf} { +test io-31.8 {Tcl_Write cr, Tcl_Gets lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1827,7 +3306,7 @@ test io-8.8 {Tcl_Write cr, Tcl_Gets lf} { close $f set l } {21 21 lf 1 {} 21 lf 1} -test io-8.9 {Tcl_Write cr, Tcl_Gets crlf} { +test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -1847,7 +3326,7 @@ test io-8.9 {Tcl_Write cr, Tcl_Gets crlf} { close $f set l } {21 21 crlf 1 {} 21 crlf 1} -test io-8.10 {Tcl_Write crlf, Tcl_Gets crlf} { +test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1867,7 +3346,7 @@ test io-8.10 {Tcl_Write crlf, Tcl_Gets crlf} { close $f set l } {hello 7 crlf 0 there 14 crlf 0} -test io-8.11 {Tcl_Write crlf, Tcl_Gets cr} { +test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1887,7 +3366,7 @@ test io-8.11 {Tcl_Write crlf, Tcl_Gets cr} { close $f set l } {hello 6 cr 0 6 13 cr 0} -test io-8.12 {Tcl_Write crlf, Tcl_Gets lf} { +test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -1907,7 +3386,7 @@ test io-8.12 {Tcl_Write crlf, Tcl_Gets lf} { close $f set l } {6 7 lf 0 6 14 lf 0} -test io-8.13 {binary mode is synonym of lf mode} { +test io-31.13 {binary mode is synonym of lf mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation binary @@ -1919,7 +3398,7 @@ test io-8.13 {binary mode is synonym of lf mode} { # Test io-9.14 has been removed because "auto" output translation mode is # not supoprted. # -test io-8.14 {Tcl_Write mixed, Tcl_Gets auto} { +test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1938,7 +3417,7 @@ test io-8.14 {Tcl_Write mixed, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.15 {Tcl_Write mixed, Tcl_Gets auto} { +test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1957,7 +3436,7 @@ test io-8.15 {Tcl_Write mixed, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.16 {Tcl_Write mixed, Tcl_Gets auto} { +test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1975,7 +3454,7 @@ test io-8.16 {Tcl_Write mixed, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.17 {Tcl_Write mixed, Tcl_Gets auto} { +test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -1994,7 +3473,7 @@ test io-8.17 {Tcl_Write mixed, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { +test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -2014,7 +3493,7 @@ test io-8.18 {Tcl_Write ^Z at end, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { +test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -eofchar \x1a -translation lf @@ -2033,7 +3512,7 @@ test io-8.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} { close $f set l } {hello there and here 0 {} 1} -test io-8.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { +test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -2052,7 +3531,7 @@ test io-8.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} { close $f set l } {abc def 0 {} 1} -test io-8.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { +test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -2070,7 +3549,7 @@ test io-8.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} { close $f set l } {abc def 0 {} 1} -test io-8.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { +test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -2092,7 +3571,7 @@ test io-8.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} { close $f set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" -test io-8.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { +test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -2114,7 +3593,7 @@ test io-8.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} { close $f set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" -test io-8.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { +test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -2136,7 +3615,7 @@ test io-8.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} { close $f set l } "abc def 0 \x1aqrs 0 tuv 0 {} 1" -test io-8.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { +test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -2154,7 +3633,7 @@ test io-8.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} { close $f set l } {abc def 0 {} 1} -test io-8.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { +test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -2172,7 +3651,7 @@ test io-8.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} { close $f set l } {abc def 0 {} 1} -test io-8.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { +test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -2190,7 +3669,7 @@ test io-8.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} { close $f set l } {abc def 0 {} 1} -test io-8.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { +test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -2208,7 +3687,7 @@ test io-8.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} { close $f set l } {abc def 0 {} 1} -test io-8.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { +test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -2226,7 +3705,7 @@ test io-8.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} { close $f set l } {abc def 0 {} 1} -test io-8.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { +test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -2244,7 +3723,7 @@ test io-8.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} { close $f set l } {abc def 0 {} 1} -test io-8.31 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { +test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -2255,7 +3734,7 @@ test io-8.31 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { } close $f set f [open test1 r] - fconfigure $f -translation auto + fconfigure $f -translation crlf set c "" while {[gets $f line] >= 0} { append c $line\n @@ -2263,13 +3742,13 @@ test io-8.31 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { close $f string length $c } [expr 700*15+1] -test io-8.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { +test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf set line "123456789ABCDE" ;# 14 char plus crlf puts -nonewline $f x ;# shift crlf across block boundary - for {set i 0} {$i < 256} {incr i} { + for {set i 0} {$i < 700} {incr i} { puts $f $line } close $f @@ -2281,24 +3760,24 @@ test io-8.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} { } close $f string length $c -} [expr 256*15+1] +} [expr 700*15+1] # Test Tcl_Read and buffering. -test io-9.1 {Tcl_Read, channel not readable} { +test io-32.1 {Tcl_Read, channel not readable} { list [catch {read stdout} msg] $msg } {1 {channel "stdout" wasn't opened for reading}} -test io-9.2 {Tcl_Read, zero byte count} { +test io-32.2 {Tcl_Read, zero byte count} { read stdin 0 } "" -test io-9.3 {Tcl_Read, negative byte count} { +test io-32.3 {Tcl_Read, negative byte count} { set f [open longfile r] set l [list [catch {read $f -1} msg] $msg] close $f set l } {1 {bad argument "-1": should be "nonewline"}} -test io-9.4 {Tcl_Read, positive byte count} { +test io-32.4 {Tcl_Read, positive byte count} { set f [open longfile r] set x [read $f 1024] set s [string length $x] @@ -2306,7 +3785,7 @@ test io-9.4 {Tcl_Read, positive byte count} { close $f set s } 1024 -test io-9.5 {Tcl_Read, multiple buffers} { +test io-32.5 {Tcl_Read, multiple buffers} { set f [open longfile r] fconfigure $f -buffersize 100 set x [read $f 1024] @@ -2315,7 +3794,7 @@ test io-9.5 {Tcl_Read, multiple buffers} { close $f set s } 1024 -test io-9.6 {Tcl_Read, very large read} { +test io-32.6 {Tcl_Read, very large read} { set f1 [open longfile r] set z [read $f1 1000000] close $f1 @@ -2323,11 +3802,11 @@ test io-9.6 {Tcl_Read, very large read} { set x ok set z [file size longfile] if {$z != $l} { - set x broken + set x broken } set x } ok -test io-9.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} { +test io-32.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} { set f1 [open longfile r] fconfigure $f1 -blocking off set z [read $f1 20] @@ -2335,11 +3814,11 @@ test io-9.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} { set l [string length $z] set x ok if {$l != 20} { - set x broken + set x broken } set x } ok -test io-9.8 {Tcl_Read, nonblocking, file} {nonBlockFiles} { +test io-32.8 {Tcl_Read, nonblocking, file} {nonBlockFiles} { set f1 [open longfile r] fconfigure $f1 -blocking off set z [read $f1 1000000] @@ -2348,11 +3827,11 @@ test io-9.8 {Tcl_Read, nonblocking, file} {nonBlockFiles} { set l [string length $z]] set z [file size longfile]] if {$z != $l} { - set x broken + set x broken } set x } ok -test io-9.9 {Tcl_Read, read to end of file} { +test io-32.9 {Tcl_Read, read to end of file} { set f1 [open longfile r] set z [read $f1] close $f1 @@ -2360,11 +3839,11 @@ test io-9.9 {Tcl_Read, read to end of file} { set x ok set z [file size longfile] if {$z != $l} { - set x broken + set x broken } set x } ok -test io-9.10 {Tcl_Read from a pipe} {stdio} { +test io-32.10 {Tcl_Read from a pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {puts [gets stdin]} @@ -2376,7 +3855,7 @@ test io-9.10 {Tcl_Read from a pipe} {stdio} { close $f1 set x } "hello\n" -test io-9.11 {Tcl_Read from a pipe} {stdio} { +test io-32.11 {Tcl_Read from a pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {puts [gets stdin]} @@ -2395,7 +3874,7 @@ test io-9.11 {Tcl_Read from a pipe} {stdio} { } {{hello } {hello }} -test io-9.12 {Tcl_Read, -nonewline} { +test io-32.12 {Tcl_Read, -nonewline} { removeFile test1 set f1 [open test1 w] puts $f1 hello @@ -2407,7 +3886,7 @@ test io-9.12 {Tcl_Read, -nonewline} { set c } {hello bye} -test io-9.13 {Tcl_Read, -nonewline} { +test io-32.13 {Tcl_Read, -nonewline} { removeFile test1 set f1 [open test1 w] puts $f1 hello @@ -2419,7 +3898,7 @@ test io-9.13 {Tcl_Read, -nonewline} { list [string length $c] $c } {9 {hello bye}} -test io-9.14 {Tcl_Read, reading in small chunks} { +test io-32.14 {Tcl_Read, reading in small chunks} { removeFile test1 set f [open test1 w] puts $f "Two lines: this one" @@ -2432,7 +3911,7 @@ test io-9.14 {Tcl_Read, reading in small chunks} { } {T wo { lines: this one and this one }} -test io-9.15 {Tcl_Read, asking for more input than available} { +test io-32.15 {Tcl_Read, asking for more input than available} { removeFile test1 set f [open test1 w] puts $f "Two lines: this one" @@ -2445,7 +3924,7 @@ test io-9.15 {Tcl_Read, asking for more input than available} { } {Two lines: this one and this one } -test io-9.16 {Tcl_Read, read to end of file with -nonewline} { +test io-32.16 {Tcl_Read, read to end of file with -nonewline} { removeFile test1 set f [open test1 w] puts $f "Two lines: this one" @@ -2460,7 +3939,7 @@ and this one} # Test Tcl_Gets. -test io-10.1 {Tcl_Gets, reading what was written} { +test io-33.1 {Tcl_Gets, reading what was written} { removeFile test1 set f1 [open test1 w] set y "first line" @@ -2470,23 +3949,23 @@ test io-10.1 {Tcl_Gets, reading what was written} { set x [gets $f1] set z ok if {"$x" != "$y"} { - set z broken + set z broken } close $f1 set z } ok -test io-10.2 {Tcl_Gets into variable} { +test io-33.2 {Tcl_Gets into variable} { set f1 [open longfile r] set c [gets $f1 x] set l [string length x] set z ok if {$l != $l} { - set z broken + set z broken } close $f1 set z } ok -test io-10.3 {Tcl_Gets from pipe} {stdio} { +test io-33.3 {Tcl_Gets from pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {puts [gets stdin]} @@ -2498,11 +3977,11 @@ test io-10.3 {Tcl_Gets from pipe} {stdio} { close $f1 set z ok if {"$x" != "hello"} { - set z broken + set z broken } set z } ok -test io-10.4 {Tcl_Gets with long line} { +test io-33.4 {Tcl_Gets with long line} { removeFile test3 set f [open test3 w] puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -2516,13 +3995,13 @@ test io-10.4 {Tcl_Gets with long line} { close $f set x } {abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} -test io-10.5 {Tcl_Gets with long line} { +test io-33.5 {Tcl_Gets with long line} { set f [open test3] set x [gets $f y] close $f list $x $y } {260 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} -test io-10.6 {Tcl_Gets and end of file} { +test io-33.6 {Tcl_Gets and end of file} { removeFile test3 set f [open test3 w] puts -nonewline $f "Test1\nTest2" @@ -2538,7 +4017,7 @@ test io-10.6 {Tcl_Gets and end of file} { close $f set x } {5 Test1 5 Test2 -1 {}} -test io-10.7 {Tcl_Gets and bad variable} { +test io-33.7 {Tcl_Gets and bad variable} { set f [open test3 w] puts $f "Line 1" puts $f "Line 2" @@ -2550,7 +4029,7 @@ test io-10.7 {Tcl_Gets and bad variable} { close $f set result } {1 {can't set "x(0)": variable isn't array}} -test io-10.8 {Tcl_Gets, exercising double buffering} { +test io-33.8 {Tcl_Gets, exercising double buffering} { set f [open test3 w] fconfigure $f -translation lf -eofchar {} set x "" @@ -2563,7 +4042,7 @@ test io-10.8 {Tcl_Gets, exercising double buffering} { close $f set y } 100 -test io-10.9 {Tcl_Gets, exercising double buffering} { +test io-33.9 {Tcl_Gets, exercising double buffering} { set f [open test3 w] fconfigure $f -translation lf -eofchar {} set x "" @@ -2576,7 +4055,7 @@ test io-10.9 {Tcl_Gets, exercising double buffering} { close $f set y } 200 -test io-10.10 {Tcl_Gets, exercising double buffering} { +test io-33.10 {Tcl_Gets, exercising double buffering} { set f [open test3 w] fconfigure $f -translation lf -eofchar {} set x "" @@ -2592,14 +4071,14 @@ test io-10.10 {Tcl_Gets, exercising double buffering} { # Test Tcl_Seek and Tcl_Tell. -test io-11.1 {Tcl_Seek to current position at start of file} { +test io-34.1 {Tcl_Seek to current position at start of file} { set f1 [open longfile r] seek $f1 0 current set c [tell $f1] close $f1 set c } 0 -test io-11.2 {Tcl_Seek to offset from start} { +test io-34.2 {Tcl_Seek to offset from start} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2612,7 +4091,7 @@ test io-11.2 {Tcl_Seek to offset from start} { close $f1 set c } 10 -test io-11.3 {Tcl_Seek to end of file} { +test io-34.3 {Tcl_Seek to end of file} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2625,7 +4104,7 @@ test io-11.3 {Tcl_Seek to end of file} { close $f1 set c } 54 -test io-11.4 {Tcl_Seek to offset from end of file} { +test io-34.4 {Tcl_Seek to offset from end of file} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2638,7 +4117,7 @@ test io-11.4 {Tcl_Seek to offset from end of file} { close $f1 set c } 44 -test io-11.5 {Tcl_Seek to offset from current position} { +test io-34.5 {Tcl_Seek to offset from current position} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2652,7 +4131,7 @@ test io-11.5 {Tcl_Seek to offset from current position} { close $f1 set c } 20 -test io-11.6 {Tcl_Seek to offset from end of file} { +test io-34.6 {Tcl_Seek to offset from end of file} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2667,7 +4146,7 @@ test io-11.6 {Tcl_Seek to offset from end of file} { list $c $r } {44 {rstuvwxyz }} -test io-11.7 {Tcl_Seek to offset from end of file, then to current position} { +test io-34.7 {Tcl_Seek to offset from end of file, then to current position} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2683,14 +4162,14 @@ test io-11.7 {Tcl_Seek to offset from end of file, then to current position} { close $f1 list $c1 $r1 $c2 } {44 rstuv 49} -test io-11.8 {Tcl_Seek on pipes: not supported} {stdio} { +test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} { set f1 [open "|[list $tcltest]" r+] set x [list [catch {seek $f1 0 current} msg] $msg] close $f1 regsub {".*":} $x {"":} x string tolower $x } {1 {error during seek on "": invalid argument}} -test io-11.9 {Tcl_Seek, testing buffered input flushing} { +test io-34.9 {Tcl_Seek, testing buffered input flushing} { removeFile test3 set f [open test3 w] fconfigure $f -eofchar {} @@ -2713,7 +4192,7 @@ test io-11.9 {Tcl_Seek, testing buffered input flushing} { close $f set x } {a d a l Y {} b} -test io-11.10 {Tcl_Seek testing flushing of buffered input} { +test io-34.10 {Tcl_Seek testing flushing of buffered input} { set f [open test3 w] fconfigure $f -translation lf puts $f xyz\n123 @@ -2727,7 +4206,7 @@ test io-11.10 {Tcl_Seek testing flushing of buffered input} { list $x [viewFile test3] } "xyz {xyz 456}" -test io-11.11 {Tcl_Seek testing flushing of buffered output} { +test io-34.11 {Tcl_Seek testing flushing of buffered output} { set f [open test3 w] puts $f xyz\n123 close $f @@ -2738,7 +4217,7 @@ test io-11.11 {Tcl_Seek testing flushing of buffered output} { close $f list $x [viewFile test3] } "zzy xyzzy" -test io-11.12 {Tcl_Seek testing combination of write, seek back and read} { +test io-34.12 {Tcl_Seek testing combination of write, seek back and read} { set f [open test3 w] fconfigure $f -translation lf -eofchar {} puts $f xyz\n123 @@ -2755,14 +4234,14 @@ test io-11.12 {Tcl_Seek testing combination of write, seek back and read} { } {14 {xyz 123 xyzzy} zzy} -test io-11.13 {Tcl_Tell at start of file} { +test io-34.13 {Tcl_Tell at start of file} { removeFile test1 set f1 [open test1 w] set p [tell $f1] close $f1 set p } 0 -test io-11.14 {Tcl_Tell after seek to end of file} { +test io-34.14 {Tcl_Tell after seek to end of file} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2775,7 +4254,7 @@ test io-11.14 {Tcl_Tell after seek to end of file} { close $f1 set c1 } 54 -test io-11.15 {Tcl_Tell combined with seeking} { +test io-34.15 {Tcl_Tell combined with seeking} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -eofchar {} @@ -2790,13 +4269,13 @@ test io-11.15 {Tcl_Tell combined with seeking} { close $f1 list $c1 $c2 } {10 20} -test io-11.16 {Tcl_tell on pipe: always -1} {stdio} { +test io-34.16 {Tcl_tell on pipe: always -1} {stdio} { set f1 [open "|[list $tcltest]" r+] set c [tell $f1] close $f1 set c } -1 -test io-11.17 {Tcl_Tell on pipe: always -1} {stdio} { +test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} { set f1 [open "|[list $tcltest]" r+] puts $f1 {puts hello} flush $f1 @@ -2805,7 +4284,7 @@ test io-11.17 {Tcl_Tell on pipe: always -1} {stdio} { close $f1 set c } -1 -test io-11.18 {Tcl_Tell combined with seeking and reading} { +test io-34.18 {Tcl_Tell combined with seeking and reading} { removeFile test2 set f [open test2 w] fconfigure $f -translation lf -eofchar {} @@ -2825,7 +4304,7 @@ test io-11.18 {Tcl_Tell combined with seeking and reading} { close $f set x } {0 3 2 12 30} -test io-11.19 {Tcl_Tell combined with opening in append mode} { +test io-34.19 {Tcl_Tell combined with opening in append mode} { set f [open test3 w] fconfigure $f -translation lf -eofchar {} puts $f "abcdefghijklmnopqrstuvwxyz" @@ -2836,7 +4315,7 @@ test io-11.19 {Tcl_Tell combined with opening in append mode} { close $f set c } 54 -test io-11.20 {Tcl_Tell combined with writing} { +test io-34.20 {Tcl_Tell combined with writing} { set f [open test3 w] set l "" seek $f 29 start @@ -2854,7 +4333,7 @@ test io-11.20 {Tcl_Tell combined with writing} { # Test Tcl_Eof -test io-12.1 {Tcl_Eof} { +test io-35.1 {Tcl_Eof} { removeFile test1 set f [open test1 w] puts $f hello @@ -2873,7 +4352,7 @@ test io-12.1 {Tcl_Eof} { close $f set x } {0 0 0 0 1 1} -test io-12.2 {Tcl_Eof with pipe} {stdio} { +test io-35.2 {Tcl_Eof with pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {gets stdin} @@ -2891,7 +4370,7 @@ test io-12.2 {Tcl_Eof with pipe} {stdio} { close $f1 set x } {0 0 0 1} -test io-12.3 {Tcl_Eof with pipe} {stdio} { +test io-35.3 {Tcl_Eof with pipe} {stdio} { removeFile pipe set f1 [open pipe w] puts $f1 {gets stdin} @@ -2913,7 +4392,7 @@ test io-12.3 {Tcl_Eof with pipe} {stdio} { close $f1 set x } {0 0 0 1 1 1} -test io-12.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { +test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { removeFile test1 set f [open test1 w] close $f @@ -2925,7 +4404,7 @@ test io-12.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} { close $f set l } {{} 1} -test io-12.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { +test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { removeFile pipe set f [open pipe w] puts $f { @@ -2939,7 +4418,7 @@ test io-12.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} { close $f set l } {{} 1} -test io-12.6 {Tcl_Eof, eof char, lf write, auto read} { +test io-35.6 {Tcl_Eof, eof char, lf write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar \x1a @@ -2953,7 +4432,7 @@ test io-12.6 {Tcl_Eof, eof char, lf write, auto read} { close $f list $s $l $e } {9 8 1} -test io-12.7 {Tcl_Eof, eof char, lf write, lf read} { +test io-35.7 {Tcl_Eof, eof char, lf write, lf read} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar \x1a @@ -2967,7 +4446,7 @@ test io-12.7 {Tcl_Eof, eof char, lf write, lf read} { close $f list $s $l $e } {9 8 1} -test io-12.8 {Tcl_Eof, eof char, cr write, auto read} { +test io-35.8 {Tcl_Eof, eof char, cr write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar \x1a @@ -2981,7 +4460,7 @@ test io-12.8 {Tcl_Eof, eof char, cr write, auto read} { close $f list $s $l $e } {9 8 1} -test io-12.9 {Tcl_Eof, eof char, cr write, cr read} { +test io-35.9 {Tcl_Eof, eof char, cr write, cr read} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar \x1a @@ -2995,7 +4474,7 @@ test io-12.9 {Tcl_Eof, eof char, cr write, cr read} { close $f list $s $l $e } {9 8 1} -test io-12.10 {Tcl_Eof, eof char, crlf write, auto read} { +test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar \x1a @@ -3009,7 +4488,7 @@ test io-12.10 {Tcl_Eof, eof char, crlf write, auto read} { close $f list $s $l $e } {11 8 1} -test io-12.11 {Tcl_Eof, eof char, crlf write, crlf read} { +test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar \x1a @@ -3023,7 +4502,7 @@ test io-12.11 {Tcl_Eof, eof char, crlf write, crlf read} { close $f list $s $l $e } {11 8 1} -test io-12.12 {Tcl_Eof, eof char in middle, lf write, auto read} { +test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -3038,7 +4517,7 @@ test io-12.12 {Tcl_Eof, eof char in middle, lf write, auto read} { close $f list $c $l $e } {17 8 1} -test io-12.13 {Tcl_Eof, eof char in middle, lf write, lf read} { +test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf -eofchar {} @@ -3053,7 +4532,7 @@ test io-12.13 {Tcl_Eof, eof char in middle, lf write, lf read} { close $f list $c $l $e } {17 8 1} -test io-12.14 {Tcl_Eof, eof char in middle, cr write, auto read} { +test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -3068,7 +4547,7 @@ test io-12.14 {Tcl_Eof, eof char in middle, cr write, auto read} { close $f list $c $l $e } {17 8 1} -test io-12.15 {Tcl_Eof, eof char in middle, cr write, cr read} { +test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr -eofchar {} @@ -3083,7 +4562,7 @@ test io-12.15 {Tcl_Eof, eof char in middle, cr write, cr read} { close $f list $c $l $e } {17 8 1} -test io-12.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { +test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -3098,7 +4577,7 @@ test io-12.16 {Tcl_Eof, eof char in middle, crlf write, auto read} { close $f list $c $l $e } {21 8 1} -test io-12.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { +test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf -eofchar {} @@ -3116,7 +4595,7 @@ test io-12.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} { # Test Tcl_InputBlocked -test io-13.1 {Tcl_InputBlocked on nonblocking pipe} {unixOrPc tempNotPc} { +test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} { set f1 [open "|[list $tcltest]" r+] puts $f1 {puts hello_from_pipe} flush $f1 @@ -3135,7 +4614,7 @@ test io-13.1 {Tcl_InputBlocked on nonblocking pipe} {unixOrPc tempNotPc} { close $f1 set x } {{} 1 hello 0 {} 1} -test io-13.2 {Tcl_InputBlocked on blocking pipe} {unixOrPc tempNotPc} { +test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} { set f1 [open "|[list $tcltest]" r+] fconfigure $f1 -buffering line puts $f1 {puts hello_from_pipe} @@ -3149,7 +4628,7 @@ test io-13.2 {Tcl_InputBlocked on blocking pipe} {unixOrPc tempNotPc} { close $f1 set x } {hello_from_pipe 0 {} 0 1} -test io-13.3 {Tcl_InputBlocked vs files, short read} { +test io-36.3 {Tcl_InputBlocked vs files, short read} { removeFile test1 set f [open test1 w] puts $f abcdefghijklmnop @@ -3165,7 +4644,7 @@ test io-13.3 {Tcl_InputBlocked vs files, short read} { close $f set l } {0 abc 0 defghijklmnop 0 1} -test io-13.4 {Tcl_InputBlocked vs files, event driven read} { +test io-36.4 {Tcl_InputBlocked vs files, event driven read} { proc in {f} { global l x lappend l [read $f 3] @@ -3182,7 +4661,7 @@ test io-13.4 {Tcl_InputBlocked vs files, event driven read} { set l } {abc def ghi jkl mno {p } eof} -test io-13.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} { +test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} { removeFile test1 set f [open test1 w] puts $f abcdefghijklmnop @@ -3199,7 +4678,7 @@ test io-13.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles close $f set l } {0 abc 0 defghijklmnop 0 1} -test io-13.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} { +test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} { proc in {f} { global l x lappend l [read $f 3] @@ -3220,7 +4699,7 @@ test io-13.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} { # Test Tcl_InputBuffered -test io-14.1 {Tcl_InputBuffered} { +test io-37.1 {Tcl_InputBuffered} { set f [open longfile r] fconfigure $f -buffersize 4096 read $f 3 @@ -3230,7 +4709,7 @@ test io-14.1 {Tcl_InputBuffered} { close $f set l } {4093 3} -test io-14.2 {Tcl_InputBuffered, test input flushing on seek} { +test io-37.2 {Tcl_InputBuffered, test input flushing on seek} { set f [open longfile r] fconfigure $f -buffersize 4096 read $f 3 @@ -3246,13 +4725,13 @@ test io-14.2 {Tcl_InputBuffered, test input flushing on seek} { # Test Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize -test io-15.1 {Tcl_GetChannelBufferSize, default buffer size} { +test io-38.1 {Tcl_GetChannelBufferSize, default buffer size} { set f [open longfile r] set s [fconfigure $f -buffersize] close $f set s } 4096 -test io-15.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} { +test io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} { set f [open longfile r] set l "" lappend l [fconfigure $f -buffersize] @@ -3274,7 +4753,7 @@ test io-15.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} { # Test Tcl_SetChannelOption, Tcl_GetChannelOption -test io-16.1 {Tcl_GetChannelOption} { +test io-39.1 {Tcl_GetChannelOption} { removeFile test1 set f1 [open test1 w] set x [fconfigure $f1 -blocking] @@ -3284,14 +4763,14 @@ test io-16.1 {Tcl_GetChannelOption} { # # Test 17.2 was removed. # -test io-16.2 {Tcl_GetChannelOption} { +test io-39.2 {Tcl_GetChannelOption} { removeFile test1 set f1 [open test1 w] set x [fconfigure $f1 -buffering] close $f1 set x } full -test io-16.3 {Tcl_GetChannelOption} { +test io-39.3 {Tcl_GetChannelOption} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -buffering line @@ -3299,7 +4778,7 @@ test io-16.3 {Tcl_GetChannelOption} { close $f1 set x } line -test io-16.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { +test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { removeFile test1 set f1 [open test1 w] set l "" @@ -3315,7 +4794,7 @@ test io-16.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} { close $f1 set l } {full line none line full} -test io-16.5 {Tcl_GetChannelOption, invariance} { +test io-39.5 {Tcl_GetChannelOption, invariance} { removeFile test1 set f1 [open test1 w] set l "" @@ -3325,7 +4804,7 @@ test io-16.5 {Tcl_GetChannelOption, invariance} { close $f1 set l } {full {1 {bad value for -buffering: must be one of full, line, or none}} full} -test io-16.6 {Tcl_SetChannelOption, multiple options} { +test io-39.6 {Tcl_SetChannelOption, multiple options} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf -buffering line @@ -3335,7 +4814,7 @@ test io-16.6 {Tcl_SetChannelOption, multiple options} { close $f1 set x } 10 -test io-16.7 {Tcl_SetChannelOption, buffering, translation} { +test io-39.7 {Tcl_SetChannelOption, buffering, translation} { removeFile test1 set f1 [open test1 w] fconfigure $f1 -translation lf @@ -3349,7 +4828,7 @@ test io-16.7 {Tcl_SetChannelOption, buffering, translation} { close $f1 set x } {0 21} -test io-16.8 {Tcl_SetChannelOption, different buffering options} { +test io-39.8 {Tcl_SetChannelOption, different buffering options} { removeFile test1 set f1 [open test1 w] set l "" @@ -3369,7 +4848,7 @@ test io-16.8 {Tcl_SetChannelOption, different buffering options} { lappend l [file size test1] set l } {5 10 10 10 20 20} -test io-16.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { +test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { removeFile test1 set f1 [open test1 w] close $f1 @@ -3385,13 +4864,15 @@ test io-16.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} { close $f1 set x } {1 0 {} {} 0 1} -test io-16.10 {Tcl_SetChannelOption, blocking mode} {unixOrPc tempNotPc} { +test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} { removeFile pipe set f1 [open pipe w] - puts $f1 {gets stdin} - puts $f1 {after 100} - puts $f1 {puts hi} - puts $f1 {gets stdin} + puts $f1 { + gets stdin + after 100 + puts hi + gets stdin + } close $f1 set x "" set f1 [open "|[list $tcltest pipe]" r+] @@ -3399,10 +4880,14 @@ test io-16.10 {Tcl_SetChannelOption, blocking mode} {unixOrPc tempNotPc} { lappend x [fconfigure $f1 -blocking] lappend x [gets $f1] lappend x [fblocked $f1] + fconfigure $f1 -blocking on puts $f1 hello + fconfigure $f1 -blocking off lappend x [gets $f1] lappend x [fblocked $f1] + fconfigure $f1 -blocking on puts $f1 bye + fconfigure $f1 -blocking off lappend x [gets $f1] lappend x [fblocked $f1] fconfigure $f1 -blocking on @@ -3415,7 +4900,7 @@ test io-16.10 {Tcl_SetChannelOption, blocking mode} {unixOrPc tempNotPc} { close $f1 set x } {0 {} 1 {} 1 {} 1 1 hi 0 0 {} 1} -test io-16.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { +test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { removeFile test1 set f [open test1 w] fconfigure $f -buffersize -10 @@ -3423,7 +4908,7 @@ test io-16.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { close $f set x } 4096 -test io-16.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { +test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { removeFile test1 set f [open test1 w] fconfigure $f -buffersize 10000000 @@ -3431,7 +4916,7 @@ test io-16.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} { close $f set x } 4096 -test io-16.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { +test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { removeFile test1 set f [open test1 w] fconfigure $f -buffersize 40000 @@ -3439,7 +4924,61 @@ test io-16.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} { close $f set x } 40000 -test io-16.14 {Tcl_SetChannelOption, setting read mode independently} \ +test io-39.13 {Tcl_SetChannelOption: -encoding, binary & utf-8} { + removeFile test1 + set f [open test1 w] + fconfigure $f -encoding {} + puts -nonewline $f \xe7\x89\xa6 + close $f + set f [open test1 r] + fconfigure $f -encoding utf-8 + set x [read $f] + close $f + set x +} \u7266 +test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} { + removeFile test1 + set f [open test1 w] + fconfigure $f -encoding binary + puts -nonewline $f \xe7\x89\xa6 + close $f + set f [open test1 r] + fconfigure $f -encoding utf-8 + set x [read $f] + close $f + set x +} \u7266 +test io-39.14 {Tcl_SetChannelOption: -encoding, errors} { + removeFile test1 + set f [open test1 w] + set result [list [catch {fconfigure $f -encoding foobar} msg] $msg] + close $f + set result +} {1 {unknown encoding "foobar"}} +test io-39.14 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio} { + set f [open "|[list $tcltest cat]" r+] + fconfigure $f -encoding binary + puts -nonewline $f "\xe7" + flush $f + fconfigure $f -encoding utf-8 -blocking 0 + set x {} + fileevent $f readable { lappend x [read $f] } + vwait x + after 300 { lappend x timeout } + vwait x + fconfigure $f -encoding utf-8 + vwait x + after 300 { lappend x timeout } + vwait x + fconfigure $f -encoding binary + vwait x + after 300 { lappend x timeout } + vwait x + close $f + set x +} "{} timeout {} timeout \xe7 timeout" + +test io-39.14 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} set s1 [socket -server accept 0] @@ -3452,7 +4991,7 @@ test io-16.14 {Tcl_SetChannelOption, setting read mode independently} \ close $s2 set modes } {auto lf} -test io-16.15 {Tcl_SetChannelOption, setting read mode independently} \ +test io-39.15 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} set s1 [socket -server accept 0] @@ -3465,7 +5004,7 @@ test io-16.15 {Tcl_SetChannelOption, setting read mode independently} \ close $s2 set modes } {auto crlf} -test io-16.16 {Tcl_SetChannelOption, setting read mode independently} \ +test io-39.16 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} set s1 [socket -server accept 0] @@ -3478,7 +5017,7 @@ test io-16.16 {Tcl_SetChannelOption, setting read mode independently} \ close $s2 set modes } {auto cr} -test io-16.17 {Tcl_SetChannelOption, setting read mode independently} \ +test io-39.17 {Tcl_SetChannelOption, setting read mode independently} \ {socket} { proc accept {s a p} {close $s} set s1 [socket -server accept 0] @@ -3492,7 +5031,7 @@ test io-16.17 {Tcl_SetChannelOption, setting read mode independently} \ set modes } {auto crlf} -test io-17.1 {POSIX open access modes: RDWR} { +test io-40.1 {POSIX open access modes: RDWR} { removeFile test3 set f [open test3 w] puts $f xyzzy @@ -3507,7 +5046,7 @@ test io-17.1 {POSIX open access modes: RDWR} { close $f set x } {zzy abzzy} -test io-17.2 {POSIX open access modes: CREAT} {unixOnly} { +test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { removeFile test3 set f [open test3 {WRONLY CREAT} 0600] file stat test3 stats @@ -3519,7 +5058,7 @@ test io-17.2 {POSIX open access modes: CREAT} {unixOnly} { close $f set x } {0600 {line 1}} -test io-17.3 {POSIX open access modes: CREAT} {$testConfig(unix) && ([exec umask] == 2)} { +test io-40.3 {POSIX open access modes: CREAT} {$testConfig(unix) && ([exec umask] == 2)} { # This test only works if your umask is 2, like ouster's. removeFile test3 set f [open test3 {WRONLY CREAT}] @@ -3527,7 +5066,7 @@ test io-17.3 {POSIX open access modes: CREAT} {$testConfig(unix) && ([exec umask file stat test3 stats format "0%o" [expr $stats(mode)&0777] } 0664 -test io-17.4 {POSIX open access modes: CREAT} { +test io-40.4 {POSIX open access modes: CREAT} { removeFile test3 set f [open test3 w] fconfigure $f -eofchar {} @@ -3542,7 +5081,7 @@ test io-17.4 {POSIX open access modes: CREAT} { close $f set x } abzzy -test io-17.5 {POSIX open access modes: APPEND} { +test io-40.5 {POSIX open access modes: APPEND} { removeFile test3 set f [open test3 w] fconfigure $f -translation lf -eofchar {} @@ -3563,7 +5102,7 @@ test io-17.5 {POSIX open access modes: APPEND} { close $f set x } {{new line} abc} -test io-17.6 {POSIX open access modes: EXCL} { +test io-40.6 {POSIX open access modes: EXCL} { removeFile test3 set f [open test3 w] puts $f xyzzy @@ -3572,7 +5111,7 @@ test io-17.6 {POSIX open access modes: EXCL} { regsub " already " $msg " " msg string tolower $msg } {1 {couldn't open "test3": file exists}} -test io-17.7 {POSIX open access modes: EXCL} { +test io-40.7 {POSIX open access modes: EXCL} { removeFile test3 set f [open test3 {WRONLY CREAT EXCL}] fconfigure $f -eofchar {} @@ -3580,7 +5119,7 @@ test io-17.7 {POSIX open access modes: EXCL} { close $f viewFile test3 } {A test line} -test io-17.8 {POSIX open access modes: TRUNC} { +test io-40.8 {POSIX open access modes: TRUNC} { removeFile test3 set f [open test3 w] puts $f xyzzy @@ -3593,7 +5132,7 @@ test io-17.8 {POSIX open access modes: TRUNC} { close $f set x } abc -test io-17.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} { +test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} { removeFile test3 set f [open test3 {WRONLY NONBLOCK CREAT}] puts $f "NONBLOCK test" @@ -3603,7 +5142,7 @@ test io-17.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} { close $f set x } {NONBLOCK test} -test io-17.10 {POSIX open access modes: RDONLY} { +test io-40.10 {POSIX open access modes: RDONLY} { set f [open test1 w] puts $f "two lines: this one" puts $f "and this" @@ -3615,15 +5154,15 @@ test io-17.10 {POSIX open access modes: RDONLY} { [list {two lines: this one} 1 \ [format "channel \"%s\" wasn't opened for writing" $f]] } 0 -test io-17.11 {POSIX open access modes: RDONLY} { +test io-40.11 {POSIX open access modes: RDONLY} { removeFile test3 string tolower [list [catch {open test3 RDONLY} msg] $msg] } {1 {couldn't open "test3": no such file or directory}} -test io-17.12 {POSIX open access modes: WRONLY} { +test io-40.12 {POSIX open access modes: WRONLY} { removeFile test3 string tolower [list [catch {open test3 WRONLY} msg] $msg] } {1 {couldn't open "test3": no such file or directory}} -test io-17.13 {POSIX open access modes: WRONLY} { +test io-40.13 {POSIX open access modes: WRONLY} { makeFile xyzzy test3 set f [open test3 WRONLY] fconfigure $f -eofchar {} @@ -3635,11 +5174,11 @@ test io-17.13 {POSIX open access modes: WRONLY} { string compare [string tolower $x] \ [list 1 "channel \"$f\" wasn't opened for reading" abzzy] } 0 -test io-17.14 {POSIX open access modes: RDWR} { +test io-40.14 {POSIX open access modes: RDWR} { removeFile test3 string tolower [list [catch {open test3 RDWR} msg] $msg] } {1 {couldn't open "test3": no such file or directory}} -test io-17.15 {POSIX open access modes: RDWR} { +test io-40.15 {POSIX open access modes: RDWR} { makeFile xyzzy test3 set f [open test3 RDWR] puts -nonewline $f "ab" @@ -3649,7 +5188,7 @@ test io-17.15 {POSIX open access modes: RDWR} { lappend x [viewFile test3] } {zzy abzzy} if {![file exists ~/_test_] && [file writable ~]} { - test io-17.16 {tilde substitution in open} { + test io-40.16 {tilde substitution in open} { set f [open ~/_test_ w] puts $f "Some text" close $f @@ -3658,7 +5197,7 @@ if {![file exists ~/_test_] && [file writable ~]} { set x } 1 } -test io-17.17 {tilde substitution in open} { +test io-40.17 {tilde substitution in open} { set home $env(HOME) unset env(HOME) set x [list [catch {open ~/foo} msg] $msg] @@ -3666,19 +5205,19 @@ test io-17.17 {tilde substitution in open} { set x } {1 {couldn't find HOME environment variable to expand path}} -test io-18.1 {Tcl_FileeventCmd: errors} { +test io-41.1 {Tcl_FileeventCmd: errors} { list [catch {fileevent foo} msg] $msg -} {1 {wrong # args: must be "fileevent channelId event ?script?}} -test io-18.2 {Tcl_FileeventCmd: errors} { +} {1 {wrong # args: should be "fileevent channelId event ?script?"}} +test io-41.2 {Tcl_FileeventCmd: errors} { list [catch {fileevent foo bar baz q} msg] $msg -} {1 {wrong # args: must be "fileevent channelId event ?script?}} -test io-18.3 {Tcl_FileeventCmd: errors} { +} {1 {wrong # args: should be "fileevent channelId event ?script?"}} +test io-41.3 {Tcl_FileeventCmd: errors} { list [catch {fileevent gorp readable} msg] $msg } {1 {can not find channel named "gorp"}} -test io-18.4 {Tcl_FileeventCmd: errors} { +test io-41.4 {Tcl_FileeventCmd: errors} { list [catch {fileevent gorp writable} msg] $msg } {1 {can not find channel named "gorp"}} -test io-18.5 {Tcl_FileeventCmd: errors} { +test io-41.5 {Tcl_FileeventCmd: errors} { list [catch {fileevent gorp who-knows} msg] $msg } {1 {bad event name "who-knows": must be readable or writable}} @@ -3688,10 +5227,10 @@ test io-18.5 {Tcl_FileeventCmd: errors} { set f [open foo w+] -test io-19.1 {Tcl_FileeventCmd: creating, deleting, querying} { +test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} { list [fileevent $f readable] [fileevent $f writable] } {{} {}} -test io-19.2 {Tcl_FileeventCmd: replacing} { +test io-42.2 {Tcl_FileeventCmd: replacing} { set result {} fileevent $f r "first script" lappend result [fileevent $f readable] @@ -3702,18 +5241,27 @@ test io-19.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} { + set result {} + fileevent $f r "first scr\0ipt" + lappend result [string length [fileevent $f readable]] + fileevent $f r "new scr\0ipt" + lappend result [string length [fileevent $f readable]] + fileevent $f r "yet ano\0ther" + lappend result [string length [fileevent $f readable]] + fileevent $f r "" + lappend result [fileevent $f readable] +} {13 11 12 {}} # # Test fileevent on a pipe # -if {($tcl_platform(platform) != "macintosh") && \ - ($testConfig(unixExecs) == 1)} { +if {$testConfig(stdio) && $testConfig(unixExecs)} { catch {set f2 [open "|[list cat -u]" r+]} catch {set f3 [open "|[list cat -u]" r+]} -test io-20.1 {Tcl_FileeventCmd: creating, deleting, querying} { +test io-43.1 {Tcl_FileeventCmd: creating, deleting, querying} { set result {} fileevent $f readable "script 1" lappend result [fileevent $f readable] [fileevent $f writable] @@ -3724,7 +5272,7 @@ test io-20.1 {Tcl_FileeventCmd: creating, deleting, querying} { fileevent $f writable {} lappend result [fileevent $f readable] [fileevent $f writable] } {{script 1} {} {script 1} {write script} {} {write script} {} {}} -test io-20.2 {Tcl_FileeventCmd: deleting when many present} { +test io-43.2 {Tcl_FileeventCmd: deleting when many present} { set result {} lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r] fileevent $f r "read f" @@ -3739,7 +5287,7 @@ test io-20.2 {Tcl_FileeventCmd: deleting when many present} { 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-21.1 {FileEventProc procedure: normal read event} { +test io-44.1 {FileEventProc procedure: normal read event} { fileevent $f2 readable { set x [gets $f2]; fileevent $f2 readable {} } @@ -3748,7 +5296,7 @@ test io-21.1 {FileEventProc procedure: normal read event} { vwait x set x } {text} -test io-21.2 {FileEventProc procedure: error in read event} { +test io-44.2 {FileEventProc procedure: error in read event} { proc bgerror args { global x set x $args @@ -3760,7 +5308,7 @@ test io-21.2 {FileEventProc procedure: error in read event} { rename bgerror {} list $x [fileevent $f2 readable] } {bogus {}} -test io-21.3 {FileEventProc procedure: normal write event} { +test io-44.3 {FileEventProc procedure: normal write event} { fileevent $f2 writable { lappend x "triggered" incr count -1 @@ -3775,7 +5323,7 @@ test io-21.3 {FileEventProc procedure: normal write event} { vwait x set x } {initial triggered triggered triggered} -test io-21.4 {FileEventProc procedure: eror in write event} { +test io-44.4 {FileEventProc procedure: eror in write event} { proc bgerror args { global x set x $args @@ -3786,7 +5334,7 @@ test io-21.4 {FileEventProc procedure: eror in write event} { rename bgerror {} list $x [fileevent $f2 writable] } {bad-write {}} -test io-21.5 {FileEventProc procedure: end of file} {unixOrPc} { +test io-44.5 {FileEventProc procedure: end of file} { set f4 [open "|[list $tcltest cat << foo]" r] fileevent $f4 readable { if {[gets $f4 line] < 0} { @@ -3812,7 +5360,7 @@ catch {close $f3} close $f makeFile "foo bar" foo -test io-22.1 {DeleteFileEvent, cleanup on close} { +test io-45.1 {DeleteFileEvent, cleanup on close} { set f [open foo r] fileevent $f readable { lappend x "binding triggered: \"[gets $f]\"" @@ -3824,7 +5372,7 @@ test io-22.1 {DeleteFileEvent, cleanup on close} { vwait y set x } {initial} -test io-22.2 {DeleteFileEvent, cleanup on close} { +test io-45.2 {DeleteFileEvent, cleanup on close} { set f [open foo r] set f2 [open foo r] fileevent $f readable { @@ -3841,7 +5389,7 @@ test io-22.2 {DeleteFileEvent, cleanup on close} { close $f2 set x } {initial {f2 triggered: "foo bar"}} -test io-22.3 {DeleteFileEvent, cleanup on close} { +test io-45.3 {DeleteFileEvent, cleanup on close} { set f [open foo r] set f2 [open foo r] set f3 [open foo r] @@ -3867,7 +5415,7 @@ test io-22.3 {DeleteFileEvent, cleanup on close} { if {[info commands testfevent] == "testfevent"} { -test io-23.1 {Tcl event loop vs multiple interpreters} { +test io-46.1 {Tcl event loop vs multiple interpreters} { testfevent create testfevent cmd { set f [open foo r] @@ -3882,7 +5430,7 @@ test io-23.1 {Tcl event loop vs multiple interpreters} { testfevent cmd {close $f} list [testfevent cmd {set x}] [testfevent cmd {info commands after}] } {{f triggered: foo bar} after} -test io-23.2 {Tcl event loop vs multiple interpreters} { +test io-46.2 {Tcl event loop vs multiple interpreters} { testfevent create testfevent cmd { set x 0 @@ -3891,7 +5439,7 @@ test io-23.2 {Tcl event loop vs multiple interpreters} { set x } } {triggered} -test io-23.3 {Tcl event loop vs multiple interpreters} { +test io-46.3 {Tcl event loop vs multiple interpreters} { testfevent create testfevent cmd { set x 0 @@ -3905,7 +5453,7 @@ test io-23.3 {Tcl event loop vs multiple interpreters} { } } {0 0 {0 timer}} -test io-24.1 {fileevent vs multiple interpreters} { +test io-47.1 {fileevent vs multiple interpreters} { set f [open foo r] set f2 [open foo r] set f3 [open foo r] @@ -3924,7 +5472,7 @@ test io-24.1 {fileevent vs multiple interpreters} { close $f3 set x } {{} {script 1} {} {sript 3}} -test io-24.2 {deleting fileevent on interpreter delete} { +test io-47.2 {deleting fileevent on interpreter delete} { set f [open foo r] set f2 [open foo r] set f3 [open foo r] @@ -3945,7 +5493,7 @@ test io-24.2 {deleting fileevent on interpreter delete} { close $f4 set x } {{script 1} {} {} {script 4}} -test io-24.3 {deleting fileevent on interpreter delete} { +test io-47.3 {deleting fileevent on interpreter delete} { set f [open foo r] set f2 [open foo r] set f3 [open foo r] @@ -3966,7 +5514,7 @@ test io-24.3 {deleting fileevent on interpreter delete} { close $f4 set x } {{script 1} {script 2} {} {}} -test io-24.4 {file events on shared files and multiple interpreters} { +test io-47.4 {file events on shared files and multiple interpreters} { set f [open foo r] set f2 [open foo r] testfevent create @@ -3982,7 +5530,7 @@ test io-24.4 {file events on shared files and multiple interpreters} { close $f2 set x } {{script 3} {script 1} {script 2}} -test io-24.5 {file events on shared files, deleting file events} { +test io-47.5 {file events on shared files, deleting file events} { set f [open foo r] testfevent create testfevent share $f @@ -3995,7 +5543,7 @@ test io-24.5 {file events on shared files, deleting file events} { close $f set x } {{} {script 2}} -test io-24.6 {file events on shared files, deleting file events} { +test io-47.6 {file events on shared files, deleting file events} { set f [open foo r] testfevent create testfevent share $f @@ -4013,7 +5561,7 @@ test io-24.6 {file events on shared files, deleting file events} { # The above curly closes the test for presence of the "testfevent" command. -test io-25.1 {testing readability conditions} { +test io-48.1 {testing readability conditions} { set f [open bar w] puts $f abcdefg puts $f abcdefg @@ -4038,7 +5586,7 @@ test io-25.1 {testing readability conditions} { vwait x list $x $l } {done {called called called called called called called}} -test io-25.2 {testing readability conditions} {nonBlockFiles} { +test io-48.2 {testing readability conditions} {nonBlockFiles} { set f [open bar w] puts $f abcdefg puts $f abcdefg @@ -4064,7 +5612,7 @@ test io-25.2 {testing readability conditions} {nonBlockFiles} { vwait x list $x $l } {done {called called called called called called called}} -test io-25.3 {testing readability conditions} {unixOnly nonBlockFiles} { +test io-48.3 {testing readability conditions} {unixOnly nonBlockFiles} { set f [open bar w] puts $f abcdefg puts $f abcdefg @@ -4108,7 +5656,7 @@ test io-25.3 {testing readability conditions} {unixOnly nonBlockFiles} { close $f list $x $l } {done {0 1 0 1 0 1 0 1 0 1 0 1 0 0}} -test io-25.4 {lf write, testing readability, ^Z termination, auto read mode} { +test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4133,7 +5681,7 @@ test io-25.4 {lf write, testing readability, ^Z termination, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.5 {lf write, testing readability, ^Z in middle, auto read mode} { +test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4158,7 +5706,7 @@ test io-25.5 {lf write, testing readability, ^Z in middle, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.6 {cr write, testing readability, ^Z termination, auto read mode} { +test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -4183,7 +5731,7 @@ test io-25.6 {cr write, testing readability, ^Z termination, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.7 {cr write, testing readability, ^Z in middle, auto read mode} { +test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -4208,7 +5756,7 @@ test io-25.7 {cr write, testing readability, ^Z in middle, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.8 {crlf write, testing readability, ^Z termination, auto read mode} { +test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -4233,7 +5781,7 @@ test io-25.8 {crlf write, testing readability, ^Z termination, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.9 {crlf write, testing readability, ^Z in middle, auto read mode} { +test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -4258,7 +5806,7 @@ test io-25.9 {crlf write, testing readability, ^Z in middle, auto read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.10 {lf write, testing readability, ^Z in middle, lf read mode} { +test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4283,7 +5831,7 @@ test io-25.10 {lf write, testing readability, ^Z in middle, lf read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.11 {lf write, testing readability, ^Z termination, lf read mode} { +test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4308,7 +5856,7 @@ test io-25.11 {lf write, testing readability, ^Z termination, lf read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.12 {cr write, testing readability, ^Z in middle, cr read mode} { +test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -4333,7 +5881,7 @@ test io-25.12 {cr write, testing readability, ^Z in middle, cr read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.13 {cr write, testing readability, ^Z termination, cr read mode} { +test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation cr @@ -4358,7 +5906,7 @@ test io-25.13 {cr write, testing readability, ^Z termination, cr read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.14 {crlf write, testing readability, ^Z in middle, crlf read mode} { +test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -4383,7 +5931,7 @@ test io-25.14 {crlf write, testing readability, ^Z in middle, crlf read mode} { vwait x list $c $l } {3 {abc def {}}} -test io-25.15 {crlf write, testing readability, ^Z termi, crlf read mode} { +test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} { removeFile test1 set f [open test1 w] fconfigure $f -translation crlf @@ -4409,7 +5957,7 @@ test io-25.15 {crlf write, testing readability, ^Z termi, crlf read mode} { list $c $l } {3 {abc def {}}} -test io-26.1 {testing crlf reading, leftover cr disgorgment} { +test io-49.1 {testing crlf reading, leftover cr disgorgment} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4438,7 +5986,7 @@ test io-26.1 {testing crlf reading, leftover cr disgorgment} { set l } "7 a 1 [list \r] 2 b 3 [list \r] 4 c 5 { } 7 0 {} 1" -test io-26.2 {testing crlf reading, leftover cr disgorgment} { +test io-49.2 {testing crlf reading, leftover cr disgorgment} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4461,7 +6009,7 @@ test io-26.2 {testing crlf reading, leftover cr disgorgment} { close $f set l } "7 [list a\r] 2 [list b\r] 4 [list c\n] 7 0 {} 7 1" -test io-26.3 {testing crlf reading, leftover cr disgorgment} { +test io-49.3 {testing crlf reading, leftover cr disgorgment} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4482,7 +6030,7 @@ test io-26.3 {testing crlf reading, leftover cr disgorgment} { close $f set l } "7 [list a\rb] 3 [list \rc\n] 7 0 {} 7 1" -test io-26.4 {testing crlf reading, leftover cr disgorgment} { +test io-49.4 {testing crlf reading, leftover cr disgorgment} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4503,7 +6051,7 @@ test io-26.4 {testing crlf reading, leftover cr disgorgment} { close $f set l } "7 [list a\rb] 3 [list \rc] 7 0 {} 7 1" -test io-26.5 {testing crlf reading, leftover cr disgorgment} { +test io-49.5 {testing crlf reading, leftover cr disgorgment} { removeFile test1 set f [open test1 w] fconfigure $f -translation lf @@ -4522,7 +6070,7 @@ test io-26.5 {testing crlf reading, leftover cr disgorgment} { set l } [list 7 a\rb\rc 7 {} 7 1] -test io-27.1 {testing handler deletion} { +test io-50.1 {testing handler deletion} { removeFile test1 set f [open test1 w] close $f @@ -4538,7 +6086,7 @@ test io-27.1 {testing handler deletion} { close $f set z } called -test io-27.2 {testing handler deletion with multiple handlers} { +test io-50.2 {testing handler deletion with multiple handlers} { removeFile test1 set f [open test1 w] close $f @@ -4556,7 +6104,7 @@ test io-27.2 {testing handler deletion with multiple handlers} { string compare [string tolower $z] \ [list [list called delhandler $f 0] [list called delhandler $f 1]] } 0 -test io-27.3 {testing handler deletion with multiple handlers} { +test io-50.3 {testing handler deletion with multiple handlers} { removeFile test1 set f [open test1 w] close $f @@ -4582,7 +6130,7 @@ test io-27.3 {testing handler deletion with multiple handlers} { [list [list delhandler $f 0 called] \ [list delhandler $f 0 deleted myself]] } 0 -test io-27.4 {testing handler deletion vs reentrant calls} { +test io-50.4 {testing handler deletion vs reentrant calls} { removeFile test1 set f [open test1 w] close $f @@ -4606,7 +6154,7 @@ test io-27.4 {testing handler deletion vs reentrant calls} { string compare [string tolower $z] \ {{delrecursive calling recursive} {delrecursive deleting recursive}} } 0 -test io-27.5 {testing handler deletion vs reentrant calls} { +test io-50.5 {testing handler deletion vs reentrant calls} { removeFile test1 set f [open test1 w] close $f @@ -4639,7 +6187,7 @@ test io-27.5 {testing handler deletion vs reentrant calls} { [list {del calling recursive} {del deleted notcalled} \ {del deleted myself} {del after update}] } 0 -test io-27.6 {testing handler deletion vs reentrant calls} { +test io-50.6 {testing handler deletion vs reentrant calls} { removeFile test1 set f [open test1 w] close $f @@ -4681,7 +6229,7 @@ test io-27.6 {testing handler deletion vs reentrant calls} { {first after update}] } 0 -test io-28.1 {Test old socket deletion on Macintosh} {socket} { +test io-51.1 {Test old socket deletion on Macintosh} {socket} { set x 0 set result "" proc accept {s a p} { @@ -4719,7 +6267,7 @@ test io-28.1 {Test old socket deletion on Macintosh} {socket} { set result } {sock1 sock2 sock3 sock4} -test io-29.1 {TclCopyChannel} { +test io-52.1 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4729,7 +6277,7 @@ test io-29.1 {TclCopyChannel} { close $f2 string compare $msg "channel \"$f1\" is busy" } {0} -test io-29.2 {TclCopyChannel} { +test io-52.2 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4741,7 +6289,7 @@ test io-29.2 {TclCopyChannel} { close $f3 string compare $msg "channel \"$f2\" is busy" } {0} -test io-29.3 {TclCopyChannel} { +test io-52.3 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4758,7 +6306,7 @@ test io-29.3 {TclCopyChannel} { } set result } {0 0 ok} -test io-29.4 {TclCopyChannel} { +test io-52.4 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4770,7 +6318,7 @@ test io-29.4 {TclCopyChannel} { close $f2 lappend result [file size test1] } {0 0 40} -test io-29.5 {TclCopyChannel} { +test io-52.5 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4787,7 +6335,7 @@ test io-29.5 {TclCopyChannel} { } set result } {0 0 ok} -test io-29.6 {TclCopyChannel} { +test io-52.6 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4804,7 +6352,7 @@ test io-29.6 {TclCopyChannel} { } set result } {0 0 ok} -test io-29.7 {TclCopyChannel} { +test io-52.7 {TclCopyChannel} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4821,7 +6369,7 @@ test io-29.7 {TclCopyChannel} { } set result } {0 0 ok} -test io-29.8 {TclCopyChannel} {stdio} { +test io-52.8 {TclCopyChannel} {stdio} { removeFile test1 removeFile pipe set f1 [open pipe w] @@ -4848,7 +6396,7 @@ test io-29.8 {TclCopyChannel} {stdio} { list $s0 [file size test1] } {40 40} -test io-30.1 {CopyData} { +test io-53.1 {CopyData} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4860,7 +6408,7 @@ test io-30.1 {CopyData} { close $f2 lappend result [file size test1] } {0 0 0} -test io-30.2 {CopyData} { +test io-53.2 {CopyData} { removeFile test1 set f1 [open [info script]] set f2 [open test1 w] @@ -4878,7 +6426,7 @@ test io-30.2 {CopyData} { } set result } {0 0 ok} -test io-30.3 {CopyData: background read underflow} {unixOnly} { +test io-53.3 {CopyData: background read underflow} {unixOnly} { removeFile test1 removeFile pipe set f1 [open pipe w] @@ -4908,8 +6456,8 @@ test io-30.3 {CopyData: background read underflow} {unixOnly} { close $f set result } "ready line1 line2 {done\n}" -test io-30.4 {CopyData: background write overflow} {unixOnly} { - set big aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n +test io-53.4 {CopyData: background write overflow} {unixOnly} { + set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n for {set x 0} {$x < 12} {incr x} { append big $big } @@ -4944,6 +6492,7 @@ test io-30.4 {CopyData: background write overflow} {unixOnly} { set big {} set x } done +set result {} proc FcopyTestAccept {sock args} { after 1000 "close $sock" @@ -4956,24 +6505,22 @@ proc FcopyTestDone {bytes {error {}}} { set fcopyTestDone 0 } } -if [catch {socket -server FcopyTestAccept 2828} listen] { - puts stderr "Skipping fcopy error test" -} else { - test io-30.5 {CopyData: error during fcopy} { - set in [open [info script]] ;# 126 K - set out [socket localhost 2828] - catch {unset fcopyTestDone} - close $listen ;# This means the socket open never really succeeds - fcopy $in $out -command FcopyTestDone - if ![info exists fcopyTestDone] { - vwait fcopyTestDone ;# The error occurs here in the b.g. - } - close $in - close $out - set fcopyTestDone ;# 1 for error condition - } 1 -} -test io-30.6 {CopyData: error during fcopy} {stdio} { + +test io-53.5 {CopyData: error during fcopy} {socket} { + set listen [socket -server FcopyTestAccept 2828] + set in [open [info script]] ;# 126 K + set out [socket localhost 2828] + catch {unset fcopyTestDone} + close $listen ;# This means the socket open never really succeeds + fcopy $in $out -command FcopyTestDone + if ![info exists fcopyTestDone] { + vwait fcopyTestDone ;# The error occurs here in the b.g. + } + close $in + close $out + set fcopyTestDone ;# 1 for error condition +} 1 +test io-53.6 {CopyData: error during fcopy} {stdio} { removeFile pipe removeFile test1 catch {unset fcopyTestDone} @@ -4991,7 +6538,7 @@ test io-30.6 {CopyData: error during fcopy} {stdio} { set fcopyTestDone ;# 0 for plain end of file } {0} -test io-31.1 {Recursive channel events} {socket} { +test io-54.1 {Recursive channel events} {socket} { # This test checks to see if file events are delivered during recursive # event loops when there is buffered data on the channel. @@ -5043,31 +6590,35 @@ test io-31.1 {Recursive channel events} {socket} { close $cs list $result $x } {{{line 1} 1 2} 2} -test io-31.2 {Testing for busy-wait in recursive channel events} {socket} { +test io-54.2 {Testing for busy-wait in recursive channel events} {socket} { + set accept {} + set after {} set s [socket -server accept 3939] proc accept {s a p} { - global counter + global counter accept + set accept $s set counter 0 fconfigure $s -blocking off -buffering line -translation lf fileevent $s readable "doit $s" } proc doit {s} { - global counter + global counter after incr counter set l [gets $s] if {"$l" == ""} { fileevent $s readable "doit1 $s" - after 1000 newline + set after [after 1000 newline] } } proc doit1 {s} { - global counter + global counter accept incr counter set l [gets $s] close $s + set accept {} } proc producer {} { global writer @@ -5088,9 +6639,12 @@ test io-31.2 {Testing for busy-wait in recursive channel events} {socket} { vwait done close $writer close $s + after cancel $after + if {$accept != {}} {close $accept} set counter } 1 -test io-32.1 {ChannelEventScriptInvoker: deletion} { + +test io-55.1 {ChannelEventScriptInvoker: deletion} { proc eventScript {fd} { close $fd error "planned error" @@ -5106,7 +6660,7 @@ test io-32.1 {ChannelEventScriptInvoker: deletion} { set x } {got_error} -test io-33.1 {ChannelTimerProc} { +test io-56.1 {ChannelTimerProc} { set f [open fooBar w] puts $f "this is a test" close $f @@ -5122,6 +6676,7 @@ test io-33.1 {ChannelTimerProc} { testchannelevent $f set 0 none after idle {set y done} vwait y + close $f lappend result $y } {2 done} @@ -5139,5 +6694,5 @@ removeFile test3 file delete cat -set x "" -unset x +restoreState +return |