diff options
Diffstat (limited to 'tests/unixNotfy.test')
| -rw-r--r-- | tests/unixNotfy.test | 96 |
1 files changed, 41 insertions, 55 deletions
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test index 2840813..2f03529 100644 --- a/tests/unixNotfy.test +++ b/tests/unixNotfy.test @@ -9,12 +9,6 @@ # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# RCS: @(#) $Id: unixNotfy.test,v 1.14 2004/05/19 20:15:32 dkf Exp $ - -# The tests should not be run if you have a notifier which is unable to -# detect infinite vwaits, as the tests below will hang. The presence of -# the "testthread" command indicates that this is the case. if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -22,61 +16,55 @@ if {[lsearch [namespace children] ::tcltest] == -1} { } # When run in a Tk shell, these tests hang. -testConstraint noTk [expr {![info exists tk_version]}] -testConstraint testthread [expr {[info commands testthread] != {}}] +testConstraint noTk [expr {0 != [catch {package present Tk}]}] +testConstraint thread [expr {0 == [catch {package require Thread 2.7-}]}] +# Darwin always uses a threaded notifier +testConstraint unthreaded [expr { + ![::tcl::pkgconfig get threaded] + && $tcl_platform(os) ne "Darwin" +}] # The next two tests will hang if threads are enabled because the notifier # will not necessarily wait for ever in this case, so it does not generate # an error. - -test unixNotfy-1.1 {Tcl_DeleteFileHandler} \ - -constraints {noTk && unixOnly && !testthread} \ - -body { - catch {vwait x} - set f [open [makeFile "" foo] w] - fileevent $f writable {set x 1} - vwait x - close $f - list [catch {vwait x} msg] $msg - } \ - -result {1 {can't wait for variable "x": would wait forever}} \ - -cleanup { - catch { close $f } - catch { removeFile foo } - } -test unixNotfy-1.2 {Tcl_DeleteFileHandler} \ - -constraints {noTk && unixOnly && !testthread} \ - -body { - catch {vwait x} - set f1 [open [makeFile "" foo] w] - set f2 [open [makeFile "" foo2] w] - fileevent $f1 writable {set x 1} - fileevent $f2 writable {set y 1} - vwait x - close $f1 - vwait y - close $f2 - list [catch {vwait x} msg] $msg - } \ - -result {1 {can't wait for variable "x": would wait forever}} \ - -cleanup { - catch { close $f1 } - catch { close $f2 } - catch { removeFile foo } - catch { removeFile foo2 } - } +test unixNotfy-1.1 {Tcl_DeleteFileHandler} -constraints {noTk unix unthreaded} -body { + catch {vwait x} + set f [open [makeFile "" foo] w] + fileevent $f writable {set x 1} + vwait x + close $f + list [catch {vwait x} msg] $msg +} -result {1 {can't wait for variable "x": would wait forever}} -cleanup { + catch { close $f } + catch { removeFile foo } +} +test unixNotfy-1.2 {Tcl_DeleteFileHandler} -constraints {noTk unix unthreaded} -body { + catch {vwait x} + set f1 [open [makeFile "" foo] w] + set f2 [open [makeFile "" foo2] w] + fileevent $f1 writable {set x 1} + fileevent $f2 writable {set y 1} + vwait x + close $f1 + vwait y + close $f2 + list [catch {vwait x} msg] $msg +} -result {1 {can't wait for variable "x": would wait forever}} -cleanup { + catch { close $f1 } + catch { close $f2 } + catch { removeFile foo } + catch { removeFile foo2 } +} test unixNotfy-2.1 {Tcl_DeleteFileHandler} \ - -constraints {noTk unixOnly testthread} \ + -constraints {noTk unix thread} \ -body { update set f [open [makeFile "" foo] w] fileevent $f writable {set x 1} vwait x close $f - testthread create "after 500 - testthread send [testthread id] {set x ok} - testthread exit" + thread::create "thread::send [thread::id] {set x ok}" vwait x set x } \ @@ -86,7 +74,7 @@ test unixNotfy-2.1 {Tcl_DeleteFileHandler} \ catch { removeFile foo } } test unixNotfy-2.2 {Tcl_DeleteFileHandler} \ - -constraints {noTk unixOnly testthread} \ + -constraints {noTk unix thread} \ -body { update set f1 [open [makeFile "" foo] w] @@ -97,11 +85,9 @@ test unixNotfy-2.2 {Tcl_DeleteFileHandler} \ close $f1 vwait y close $f2 - testthread create "after 500 - testthread send [testthread id] {set x ok} - testthread exit" - vwait x - set x + thread::create "thread::send [thread::id] {set x ok}" + vwait x + set x } \ -result {ok} \ -cleanup { |