summaryrefslogtreecommitdiffstats
path: root/tests/unixNotfy.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unixNotfy.test')
-rw-r--r--tests/unixNotfy.test127
1 files changed, 65 insertions, 62 deletions
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
index 2775597..2f03529 100644
--- a/tests/unixNotfy.test
+++ b/tests/unixNotfy.test
@@ -9,36 +9,39 @@
#
# 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.4 1999/04/16 00:47:36 stanton 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} {
- source [file join [pwd] [file dirname [info script]] defs.tcl]
+ package require tcltest 2
+ namespace import -force ::tcltest::*
}
-set ::tcltest::testConfig(testthread) \
- [expr {[info commands testthread] != {}}]
+# When run in a Tk shell, these tests hang.
+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} {unixOnly && !testthread} {
+test unixNotfy-1.1 {Tcl_DeleteFileHandler} -constraints {noTk unix unthreaded} -body {
catch {vwait x}
- set f [open foo w]
+ set f [open [makeFile "" foo] w]
fileevent $f writable {set x 1}
vwait x
close $f
list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x": would wait forever}}
-test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
+} -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 foo w]
- set f2 [open foo2 w]
+ 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
@@ -46,54 +49,54 @@ test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
vwait y
close $f2
list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x": would wait forever}}
-
-
-test unixNotfy-2.1 {Tcl_DeleteFileHandler} {unixOnly testthread} {
- update
- set f [open 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"
- vwait x
- set x
-} {ok}
-test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly testthread} {
- update
- set f1 [open foo w]
- set f2 [open foo2 w]
- fileevent $f1 writable {set x 1}
- fileevent $f2 writable {set y 1}
- vwait x
- close $f1
- vwait y
- close $f2
- testthread create "after 500
- testthread send [testthread id] {set x ok}
- testthread exit"
- vwait x
- set x
-} {ok}
-
+} -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 unix thread} \
+ -body {
+ update
+ set f [open [makeFile "" foo] w]
+ fileevent $f writable {set x 1}
+ vwait x
+ close $f
+ thread::create "thread::send [thread::id] {set x ok}"
+ vwait x
+ set x
+ } \
+ -result {ok} \
+ -cleanup {
+ catch { close $f }
+ catch { removeFile foo }
+ }
+test unixNotfy-2.2 {Tcl_DeleteFileHandler} \
+ -constraints {noTk unix thread} \
+ -body {
+ update
+ 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
+ thread::create "thread::send [thread::id] {set x ok}"
+ vwait x
+ set x
+ } \
+ -result {ok} \
+ -cleanup {
+ catch { close $f1 }
+ catch { close $f2 }
+ catch { removeFile foo }
+ catch { removeFile foo2 }
+ }
# cleanup
-file delete foo
-file delete foo2
::tcltest::cleanupTests
return
-
-
-
-
-
-
-
-
-
-
-
-