summaryrefslogtreecommitdiffstats
path: root/tests/unixNotfy.test
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 08:12:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 08:12:48 (GMT)
commit679c72e5a2c14ab53b227e058c4ef06edde6b7a4 (patch)
treeb28a3a30c684e4377f39e18d3b4689891cab876b /tests/unixNotfy.test
parentfe0e5c84250f9e45fcbf320d121a961c767b3b5a (diff)
parentef09f86d39a751b46143aa33f2ee808b31a6a984 (diff)
downloadtcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.zip
tcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.tar.gz
tcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.tar.bz2
merge trunk to feature branchtip_388_impl
Diffstat (limited to 'tests/unixNotfy.test')
-rw-r--r--tests/unixNotfy.test15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
index 8af8a21..9684bfe 100644
--- a/tests/unixNotfy.test
+++ b/tests/unixNotfy.test
@@ -20,7 +20,8 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
}
# When run in a Tk shell, these tests hang.
-testConstraint noTk [expr {![info exists tk_version]}]
+testConstraint noTk [expr {0 != [catch {package present Tk}]}]
+testConstraint thread [expr {0 == [catch {package require Thread 2.6}]}]
testConstraint testthread [expr {[info commands testthread] != {}}]
# Darwin always uses a threaded notifier
testConstraint unthreaded [expr {
@@ -61,16 +62,16 @@ test unixNotfy-1.2 {Tcl_DeleteFileHandler} -constraints {noTk unix unthreaded} -
}
test unixNotfy-2.1 {Tcl_DeleteFileHandler} \
- -constraints {noTk unix 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 "testthread send [testthread id] {set x ok}"
+ set t [thread::create -preserved "thread::send [thread::id] {set x ok}"]
vwait x
- threadReap
+ thread::release $t
set x
} \
-result {ok} \
@@ -79,7 +80,7 @@ test unixNotfy-2.1 {Tcl_DeleteFileHandler} \
catch { removeFile foo }
}
test unixNotfy-2.2 {Tcl_DeleteFileHandler} \
- -constraints {noTk unix testthread} \
+ -constraints {noTk unix thread} \
-body {
update
set f1 [open [makeFile "" foo] w]
@@ -90,9 +91,9 @@ test unixNotfy-2.2 {Tcl_DeleteFileHandler} \
close $f1
vwait y
close $f2
- testthread create "testthread send [testthread id] {set x ok}"
+ set t [thread::create -preserved "thread::send [thread::id] {set x ok}"]
vwait x
- threadReap
+ thread::release $t
set x
} \
-result {ok} \