merge core-8-6-branch

tests/unixWm.test

@@ -121,11 +121,11 @@ set i 1
 foreach geom "+$X+80 +$X+40 +$X+$Y0" {
     test unixWm-4.$i {moving window while withdrawn} unix {
 	wm withdraw .t
-	update idletasks
+	sleep 10
 	wm geom .t $geom
 	update idletasks
 	wm deiconify .t
-	update idletasks
+	sleep 10
 	wm geom .t
     } 100x150$geom
     incr i
@@ -246,10 +246,6 @@ test unixWm-6.4 {size changes} {unix nonPortable userInteraction} {
     list $width $height $w2 $h2 [wm geom .t]
 } {0 0 230 110 114x261+10+10}
 
-# I don't know why the wait below is needed, but without it the test
-# fails under twm.
-sleep 200
-
 test unixWm-6.5 {window initially iconic} {unix nonPortable} {
     destroy .t
     toplevel .t -width 100 -height 30
@@ -1567,19 +1563,19 @@ test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} unix {
 } {100 1}
 destroy .t
 toplevel .t -width 80 -height 60
-test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
-    tkwait visibility .t
+test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix} {
     wm overrideredirect .t 1
+    tkwait visibility .t
     update
     wm geometry .t +5-10
     update
     list [winfo x .t] [winfo y .t]
 } [list 5 [expr [winfo screenheight .t] - 70]]
 destroy .t
 toplevel .t -width 80 -height 60
-test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
-    tkwait visibility .t
+test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix} {
     wm overrideredirect .t 1
+    tkwait visibility .t
     update
     wm geometry .t -30+$Y2
     update
@@ -1839,8 +1835,8 @@ test unixWm-50.2 {Tk_CoordsToWindow procedure, finding a toplevel, y-coords and
     update
     restackDelay
     toplevel .t2 -width 200 -height 100 -bg blue
-    tkwait visibility .t2
     wm overrideredirect .t2 1
+    tkwait visibility .t2
     wm geom .t2 +200+200
     update
     raise .t2
@@ -2093,6 +2089,7 @@ test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {uni
     set result [list [winfo containing 100 100]]
     lower .t3
     restackDelay
+    sleep 10
     lappend result [winfo containing 100 100]
 } {.t3 .t}
 test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} unix {

tests/wm.test

@@ -1672,8 +1672,8 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body {
 test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
     overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body {
     toplevel .t
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     raise .
     update
     raiseDelay
@@ -1684,8 +1684,8 @@ test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
 test wm-stackorder-5.2.1 {A normal toplevel can be raised above an \
     overrideredirect toplevel on macOS or win} -constraints aquaOrWin32 -body {
     toplevel .t
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     raise .
     update
     raiseDelay
@@ -1694,10 +1694,10 @@ test wm-stackorder-5.2.1 {A normal toplevel can be raised above an \
     destroy .t
 } -result 1
 test wm-stackorder-5.3 {An overrideredirect window\
-        can be explicitly lowered} -constraints failsOnXQuarz -body {
+        can be explicitly lowered} -body {
     toplevel .t
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     lower .t
     update
     raiseDelay