Merge 8.7

5 files changed, 10 insertions, 7 deletions

diff --git a/tests/bind.test b/tests/bind.test
index 594fac8..c27412d 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6820,19 +6820,19 @@ test bind-33.21 {simulate use of the keyboard to trigger a pattern sequence with
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
     wm geometry .top +100+100
-    update
+    after 10 ; update
 } -body {
     # In order to avoid platform-dependent coordinate results due to
     # decorations and borders, this test warps the pointer twice
     # relatively to a window that moved in the meantime, and checks
     # how much the pointer moved
     wm geometry .top +200+200
-    update
+    after 10 ; update
     event generate .top <Motion> -x 20 -y 20 -warp 1
     after 50  ; # Win specific - wait for SendInput to be executed
     set pointerPos1 [winfo pointerxy .top]
     wm geometry .top +600+600
-    update
+    after 10 ; update
     event generate .top <Motion> -x 20 -y 20 -warp 1
     after 50  ; # Win specific - wait for SendInput to be executed
     set pointerPos2 [winfo pointerxy .top]
diff --git a/tests/menu.test b/tests/menu.test
index 5055e5c..fdd5969 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -3947,7 +3947,7 @@ test menu-37.1 {menubar menues cannot be posted - bug 2160206} -setup {
 } -result {1 {a menubar menu cannot be posted}}
 
 test menu-38.1 {Can't dismiss ttk::menubutton menu until mouse has hovered over it - bug fa32290898} -setup {
-} -constraints {userInteraction} -body {
+} -constraints {x11} -body {
     toplevel .top
     ttk::menubutton .top.mb -text "Some menu";
     menu .top.mb.m;
diff --git a/tests/send.test b/tests/send.test
index 949ce03..9ce8026 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -16,6 +16,7 @@ tcltest::loadTestedCommands
 
 testConstraint xhost [llength [auto_execok xhost]]
 testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # Compute a script that will load Tk into a child interpreter.
 
@@ -297,7 +298,7 @@ test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver te
 "if 1 {open bogus_file_name}"
     invoked from within
 "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}}
-test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} {
+test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu failsOnXQuarz} {
     testsend prop root InterpRegistry "10234 bogus\n"
     set result [list [catch {send bogus bogus command} msg] $msg]
     winfo interps
diff --git a/tests/tk.test b/tests/tk.test
index 6a9d1e9..f424c77 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -11,6 +11,7 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 testConstraint testprintf [llength [info command testprintf]]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 test tk-1.1 {tk command: general} -body {
     tk
@@ -154,7 +155,7 @@ test tk-6.3 {tk inactive wrong argument} -body {
 test tk-6.4 {tk inactive too many arguments} -body {
     tk inactive reset foo
 } -returnCodes 1 -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"}
-test tk-6.5 {tk inactive} -body {
+test tk-6.5 {tk inactive} -constraints failsOnXQuarz -body {
     tk inactive reset
     update
     after 100
diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test
index 8f47483..fc2f9d3 100644
--- a/tests/ttk/entry.test
+++ b/tests/ttk/entry.test
@@ -8,6 +8,7 @@ namespace import -force tcltest::*
 loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 variable scrollInfo
 proc scroll args {
@@ -77,7 +78,7 @@ test entry-2.1 "Create entry before scrollbar" -body {
     	-expand false -fill x
 }  -cleanup {destroy .te .tsb}
 
-test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints failsOnUbuntu -body {
+test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints {failsOnUbuntu failsOnXQuarz} -body {
     pack [ttk::entry .te -xscrollcommand [list .tsb set]] \
 	-expand true -fill both
     .te insert end [string repeat "abc" 50]