diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
| commit | 089a364ffa502039ae4d42853857206dbeddc250 (patch) | |
| tree | 4701b3aff5e43914b137d6bc202f02192bc0c9c0 /tests/focus.test | |
| parent | 611539b46b3f35feff024c8e9c22b8bf93a025d8 (diff) | |
| parent | 10bca5a542048ae2e11701980f2997e26ce28433 (diff) | |
| download | tk-089a364ffa502039ae4d42853857206dbeddc250.zip tk-089a364ffa502039ae4d42853857206dbeddc250.tar.gz tk-089a364ffa502039ae4d42853857206dbeddc250.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests/focus.test')
| -rw-r--r-- | tests/focus.test | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/focus.test b/tests/focus.test index 20d25eb..f60d120 100644 --- a/tests/focus.test +++ b/tests/focus.test @@ -12,6 +12,7 @@ tcltest::loadTestedCommands namespace import -force tcltest::test testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] proc focusSetup {} { destroy .t @@ -310,7 +311,7 @@ in .t.b1 NotifyNonlinear } .t.b1} test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints { - unix testwrapper failsOnUbuntu + unix testwrapper failsOnUbuntu failsOnXQuarz } -body { focus .t.b1 focus . @@ -322,7 +323,7 @@ test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints { list $x $focusInfo } -result {.t.b1 {press .t.b1 x}} test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} -constraints { - unix testwrapper failsOnUbuntu + unix testwrapper failsOnUbuntu failsOnXQuarz } -body { set result {} foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear @@ -343,7 +344,7 @@ test focus-2.8 {TkFocusFilterEvent procedure, FocusOut events} -constraints { focus } -result {.t.b1} test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} -constraints { - unix testwrapper failsOnUbuntu + unix testwrapper failsOnUbuntu failsOnXQuarz } -body { focus .t.b1 event gen [testwrapper .] <FocusOut> -detail NotifyAncestor @@ -601,7 +602,7 @@ cleanupbg # Test 5.1 fails (before and after update) test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} -constraints { - unix testwrapper secureserver failsOnUbuntu + unix testwrapper secureserver failsOnUbuntu failsOnXQuarz } -body { setupbg focusSetup |