diff options
author | kjnash <k.j.nash@usa.net> | 2020-08-22 04:09:14 (GMT) |
---|---|---|
committer | kjnash <k.j.nash@usa.net> | 2020-08-22 04:09:14 (GMT) |
commit | dc1ca56b6a1fa6cb94309c2fa11e161997f9f2a8 (patch) | |
tree | af79c3a64753f4c875bef836678f4924049a3f30 /tests | |
parent | cc21b0be2ad2d9c16af8d9dbdf188110479ebfc7 (diff) | |
parent | 1971f6ab14ff7b267507deb6e4090bc41e807c21 (diff) | |
download | tcl-dc1ca56b6a1fa6cb94309c2fa11e161997f9f2a8.zip tcl-dc1ca56b6a1fa6cb94309c2fa11e161997f9f2a8.tar.gz tcl-dc1ca56b6a1fa6cb94309c2fa11e161997f9f2a8.tar.bz2 |
Merge 8.6
Diffstat (limited to 'tests')
-rw-r--r-- | tests/event.test | 5 | ||||
-rw-r--r-- | tests/io.test | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/event.test b/tests/event.test index b42909c..70d4cff 100644 --- a/tests/event.test +++ b/tests/event.test @@ -23,11 +23,12 @@ testConstraint testfilehandler [llength [info commands testfilehandler]] testConstraint testexithandler [llength [info commands testexithandler]] testConstraint testfilewait [llength [info commands testfilewait]] testConstraint exec [llength [info commands exec]] - +testConstraint notOSX [expr {$::tcl_platform(os) ne "Darwin"}] + test event-1.1 {Tcl_CreateFileHandler, reading} -setup { testfilehandler close set result "" -} -constraints testfilehandler -body { +} -constraints {testfilehandler notOSX} -body { testfilehandler create 0 readable off testfilehandler clear 0 testfilehandler oneevent diff --git a/tests/io.test b/tests/io.test index 685394c..18636c1 100644 --- a/tests/io.test +++ b/tests/io.test @@ -6871,7 +6871,7 @@ test io-50.5 {testing handler deletion vs reentrant calls} -constraints {testcha } -cleanup { close $f } -result [list {del calling recursive} {del deleted notcalled} \ - {del deleted myself} {del after recursive}] + {del deleted myself} {del after recursive}] test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testchannelevent testservicemode} -setup { file delete $path(test1) } -body { @@ -6880,6 +6880,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha proc first {f} { variable u variable z + variable done if {"$u" == "toplevel"} { lappend z "first called" set u first @@ -6887,6 +6888,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha vwait z after cancel $timer lappend z "first after toplevel" + set done 1 } else { lappend z "first called not toplevel" } @@ -6908,19 +6910,24 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha } set z "" set u toplevel + set done 0 testservicemode 0 set f [open $path(test1) r] testchannelevent $f add readable [namespace code [list second $f]] testchannelevent $f add readable [namespace code [list first $f]] testservicemode 1 update + if {!$done} { + set timer2 [after 200 set done 1] + vwait done + after cancel $timer2 + } set z } -cleanup { close $f } -result [list {first called} {first called not toplevel} \ {second called, first time} {second called, second time} \ {first after toplevel}] - test io-51.1 {Test old socket deletion on Macintosh} {socket} { set x 0 set result "" |