diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fontchooser.test | 13 | ||||
| -rw-r--r-- | tests/winDialog.test | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/tests/fontchooser.test b/tests/fontchooser.test index 0f90a46..a634300 100644 --- a/tests/fontchooser.test +++ b/tests/fontchooser.test @@ -2,7 +2,7 @@ # # Copyright (c) 2008 Pat Thoyts # -# RCS: @(#) $Id: fontchooser.test,v 1.1 2008/12/10 05:02:52 das Exp $ +# RCS: @(#) $Id: fontchooser.test,v 1.2 2008/12/10 13:41:19 patthoyts Exp $ # package require tcltest 2.1 @@ -89,11 +89,12 @@ test fontchooser-1.9 {tk fontchooser: usage} -returnCodes error -body { } -match glob -result {*} # ------------------------------------------------------------------------- -# By explicitly calling the tk internal command we always test the script -# implementation here even when the current platform defines a native -# font dialog. This is intentional in this test file. - -source [file join $tk_library fontchooser.tcl] +# +# The remaining tests in this file are only relevant for the script +# implementation. They can be tested by sourcing the script file but +# the Tk tests are run with -singleproc 1 and doing this affects the +# result of later attempts to test the native implementations. +# testConstraint scriptImpl [llength [info proc ::tk::fontchooser::Configure]] test fontchooser-2.0 {fontchooser -title} -constraints scriptImpl -body { diff --git a/tests/winDialog.test b/tests/winDialog.test index 3a5c347..f176e92 100644 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # Copyright (c) 1998-1999 ActiveState Corporation. # -# RCS: @(#) $Id: winDialog.test,v 1.24 2008/12/10 05:02:52 das Exp $ +# RCS: @(#) $Id: winDialog.test,v 1.25 2008/12/10 13:41:19 patthoyts Exp $ package require tcltest 2.2 namespace import ::tcltest::* @@ -43,13 +43,13 @@ proc then {cmd} { proc afterbody {} { if {$::tk_dialog == 0} { - if {[incr ::iter_after] > 30} { - set ::dialogresult ">30 iterations waiting on tk_dialog" + if {[incr ::iter_after] > 30} { + set ::dialogresult ">30 iterations waiting on tk_dialog" + return + } + after 150 {afterbody} return } - after 150 {afterbody} - return - } uplevel #0 {set dialogresult [eval $command]} } |