From 06374e267ab5ffeccccd30401d5d732a5c6fb06c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 8 Oct 2023 13:04:04 +0000
Subject: Let branch less_tests_constraints build at Github Actions for all
 platforms.

---
 .github/workflows/linux-build.yml | 1 +
 .github/workflows/mac-build.yml   | 1 +
 .github/workflows/win-build.yml   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index d594c0c..206da33 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-6-branch"
+    - "less_tests_constraints"
     tags:
     - "core-**"
 permissions:
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 6c06a55..791f03d 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-6-branch"
+    - "less_tests_constraints"
     tags:
     - "core-**"
 permissions:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 75f3a99..5c2819b 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-6-branch"
+    - "less_tests_constraints"
     tags:
     - "core-**"
 permissions:
-- 
cgit v0.12


From dd562fbf5588c9ea41d3e2368e8cbf07c5ee1ec4 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 8 Oct 2023 13:11:44 +0000
Subject: wm.test - Let wm-stackorder-5.2 and wm-stackorder-5.3 pass on Debian
 11 by reading the manual (which says: 'the override-redirect flag is only
 guaranteed to be taken notice of when the window is first mapped or when
 mapped after the state is changed from withdrawn to normal'). Constraints
 failsOnUbuntu and failsOnXQuarz removed from these tests.

---
 tests/wm.test | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/wm.test b/tests/wm.test
index a300838..a0c5c30 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1530,10 +1530,10 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body {
     destroy .t
 } -result {.t .}
 test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
-    overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body {
+    overrideredirect toplevel on unix} -constraints x11 -body {
     toplevel .t
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     raise .
     update
     raiseDelay
@@ -1544,8 +1544,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
@@ -1554,10 +1554,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
-- 
cgit v0.12


From ffb4bcc9a5effa3ed7302a34c21490f3398615df Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 8 Oct 2023 19:15:48 +0000
Subject: wm-stackorder-5.2 really fails on XQuartz (this seems to be an
 implementation bug). It also fails when run as if at Github Actions, i.e.
 when Xvfb is used. Certains tests such as this one must run on top of a
 window manager to pass, they need more than just a virtual framebuffer
 (Xvfb). Therefore, restore the two constraints failsOnUbuntu and
 failsOnXQuarz for wm-stackorder-5.2

---
 tests/wm.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/wm.test b/tests/wm.test
index a0c5c30..f931e3b 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1530,7 +1530,7 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body {
     destroy .t
 } -result {.t .}
 test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
-    overrideredirect toplevel on unix} -constraints x11 -body {
+    overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body {
     toplevel .t
     wm overrideredirect .t 1
     tkwait visibility .t
-- 
cgit v0.12


From 0f5e6fa7d817f50aea33fbd8d97c893c4d299d22 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 14 Oct 2023 08:41:54 +0000
Subject: unixWm.test - Let unixWm-4.1, -4.2 and -4.3 pass on Debian 11 by
 processing events while waiting a bit for the window to be withdrawn and
 deiconified. Also, remove the ancestral sleep that was once apparently needed
 for the tests to pass under twm.

---
 tests/unixWm.test | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index d296858..2918e84 100644
--- a/tests/unixWm.test
+++ b/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
-- 
cgit v0.12


From 5ceb778917d5bd60cef820bfae69dbd540bc18b5 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 14 Oct 2023 08:57:18 +0000
Subject: unixWm.test - Let unixWm-44.7 and -44.8 pass on Debian 11 by reading
 the manual (which says: 'the override-redirect flag is only guaranteed to be
 taken notice of when the window is first mapped or when mapped after the
 state is changed from withdrawn to normal'). Same recipe as [c53b0c12].

---
 tests/unixWm.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 2918e84..e9cae75 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1564,8 +1564,8 @@ test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} unix {
 destroy .t
 toplevel .t -width 80 -height 60
 test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     update
     wm geometry .t +5-10
     update
@@ -1574,8 +1574,8 @@ test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsO
 destroy .t
 toplevel .t -width 80 -height 60
 test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
-    tkwait visibility .t
     wm overrideredirect .t 1
+    tkwait visibility .t
     update
     wm geometry .t -30+$Y2
     update
-- 
cgit v0.12


From d79dbc8332c9640340ee67745b0de2e093c6d536 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 15 Oct 2023 16:30:25 +0000
Subject: unixWm.test - Let unixWm-45.2 and -45.4 pass on Linux by
 cherrypicking [b4ae383b] and [391bac1d] that fix bug [22eefb9368].

---
 macosx/tkMacOSXWm.c |  9 ++++-----
 tests/unixWm.test   |  4 ++--
 unix/tkUnixWm.c     | 11 +++++------
 win/tkWinWm.c       |  9 ++++-----
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 0adfe4b..858ac34 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -2205,7 +2205,7 @@ WmGridCmd(
 	 * ungridded numbers.
 	 */
 
-	wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+	wmPtr->sizeHintsFlags &= ~PBaseSize;
 	if (wmPtr->width != -1) {
 	    wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		    - wmPtr->reqGridWidth)*wmPtr->widthInc;
@@ -3984,8 +3984,7 @@ Tk_SetGrid(
 	    && (wmPtr->reqGridHeight == reqHeight)
 	    && (wmPtr->widthInc == widthInc)
 	    && (wmPtr->heightInc == heightInc)
-	    && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc))
-		    == (PBaseSize|PResizeInc))) {
+	    && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) {
 	return;
     }
 
@@ -4015,7 +4014,7 @@ Tk_SetGrid(
     wmPtr->reqGridHeight = reqHeight;
     wmPtr->widthInc = widthInc;
     wmPtr->heightInc = heightInc;
-    wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc;
+    wmPtr->sizeHintsFlags |= PBaseSize;
     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
 	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
@@ -4063,7 +4062,7 @@ Tk_UnsetGrid(
     }
 
     wmPtr->gridWin = NULL;
-    wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+    wmPtr->sizeHintsFlags &= ~PBaseSize;
     if (wmPtr->width != -1) {
 	wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		- wmPtr->reqGridWidth)*wmPtr->widthInc;
diff --git a/tests/unixWm.test b/tests/unixWm.test
index e9cae75..960d039 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1623,7 +1623,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu failsOnXQuarz} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1651,7 +1651,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu failsOnXQuarz} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 9154c1d..df9cb76 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -1995,7 +1995,7 @@ WmGridCmd(
 	 * ungridded numbers.
 	 */
 
-	wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+	wmPtr->sizeHintsFlags &= ~PBaseSize;
 	if (wmPtr->width != -1) {
 	    wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		    - wmPtr->reqGridWidth)*wmPtr->widthInc;
@@ -3819,8 +3819,7 @@ Tk_SetGrid(
 	    && (wmPtr->reqGridHeight == reqHeight)
 	    && (wmPtr->widthInc == widthInc)
 	    && (wmPtr->heightInc == heightInc)
-	    && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc))
-		    == (PBaseSize|PResizeInc))) {
+	    && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) {
 	return;
     }
 
@@ -3851,7 +3850,7 @@ Tk_SetGrid(
     wmPtr->reqGridHeight = reqHeight;
     wmPtr->widthInc = widthInc;
     wmPtr->heightInc = heightInc;
-    wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc;
+    wmPtr->sizeHintsFlags |= PBaseSize;
     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
 	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
@@ -3910,7 +3909,7 @@ Tk_UnsetGrid(
     }
 
     wmPtr->gridWin = NULL;
-    wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+    wmPtr->sizeHintsFlags &= ~PBaseSize;
     if (wmPtr->width != -1) {
 	wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		- wmPtr->reqGridWidth)*wmPtr->widthInc;
@@ -4878,7 +4877,7 @@ UpdateSizeHints(
     hintsPtr->max_aspect.x = wmPtr->maxAspect.x;
     hintsPtr->max_aspect.y = wmPtr->maxAspect.y;
     hintsPtr->win_gravity = wmPtr->gravity;
-    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize;
+    hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize | PResizeInc;
 
     /*
      * If the window isn't supposed to be resizable, then set the minimum and
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 34ae154..98c699e 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -3847,7 +3847,7 @@ WmGridCmd(
 	 * ungridded numbers.
 	 */
 
-	wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+	wmPtr->sizeHintsFlags &= ~PBaseSize;
 	if (wmPtr->width != -1) {
 	    wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		    - wmPtr->reqGridWidth)*wmPtr->widthInc;
@@ -5793,8 +5793,7 @@ Tk_SetGrid(
 	    && (wmPtr->reqGridHeight == reqHeight)
 	    && (wmPtr->widthInc == widthInc)
 	    && (wmPtr->heightInc == heightInc)
-	    && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc))
-		    == (PBaseSize|PResizeInc))) {
+	    && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) {
 	return;
     }
 
@@ -5825,7 +5824,7 @@ Tk_SetGrid(
     wmPtr->reqGridHeight = reqHeight;
     wmPtr->widthInc = widthInc;
     wmPtr->heightInc = heightInc;
-    wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc;
+    wmPtr->sizeHintsFlags |= PBaseSize;
     if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) {
 	Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr);
 	wmPtr->flags |= WM_UPDATE_PENDING;
@@ -5876,7 +5875,7 @@ Tk_UnsetGrid(
     }
 
     wmPtr->gridWin = NULL;
-    wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc);
+    wmPtr->sizeHintsFlags &= ~PBaseSize;
     if (wmPtr->width != -1) {
 	wmPtr->width = winPtr->reqWidth + (wmPtr->width
 		- wmPtr->reqGridWidth)*wmPtr->widthInc;
-- 
cgit v0.12


From 8c2b473a7acbe4e64b111e49908cc17f3fd5496b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 15 Oct 2023 16:39:05 +0000
Subject: Cherrypick [93f53f4aec]: Restore the failsOnXQuarz constraint on
 unixWM-45.2 and unixWm-45.4 since on XQuartz these tests still do fail.

---
 tests/unixWm.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 960d039..6e2790b 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1623,7 +1623,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnXQuarz} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1651,7 +1651,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnXQuarz} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
-- 
cgit v0.12


From 9c0eca74159ba31c9865760a99a3658df884c05c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 15 Oct 2023 18:06:01 +0000
Subject: Cherrypick [8215b8356a]: Backout previous commit. In fact unixWM-45.2
 and unixWm-45.4 do pass on XQuartz (which is expected since the Linux
 implementation is used in this case).

---
 tests/unixWm.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 6e2790b..960d039 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1623,7 +1623,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnXQuarz} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1651,7 +1651,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnXQuarz} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
-- 
cgit v0.12


From 6fde21fe27a252c0666a66f980e187bca0d05e4c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 15 Oct 2023 18:18:50 +0000
Subject: unixWm.test - Let unixWm-50.2 pass on Debian 11 by reading the manual
 (which says: 'the override-redirect flag is only guaranteed to be taken
 notice of when the window is first mapped or when mapped after the state is
 changed from withdrawn to normal'). Same recipe as [c53b0c12].

---
 tests/unixWm.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 960d039..64240eb 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1835,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
-- 
cgit v0.12


From 22b0ae6ab95c29a6e4e8f2d23e792a922ef449e6 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 15 Oct 2023 20:11:14 +0000
Subject: Remove 8 'failsOnXQuarz' constraints since these tests do not
 actually fail on XQuarz, at least for me.

---
 tests/unixWm.test | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 64240eb..00a8268 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -300,7 +300,7 @@ test unixWm-8.3 {icon windows} unix {
     toplevel .t -width 100 -height 30
     list [catch {wm iconwindow .t b c} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
-test unixWm-8.4 {icon windows} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .icon
     toplevel .t -width 100 -height 30
@@ -645,7 +645,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -864,7 +864,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
@@ -875,7 +875,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu fail
     destroy .t2
     set result
 } 0
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
@@ -1446,7 +1446,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1563,7 +1563,7 @@ 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} {
+test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix} {
     wm overrideredirect .t 1
     tkwait visibility .t
     update
@@ -1573,7 +1573,7 @@ test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsO
 } [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} {
+test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix} {
     wm overrideredirect .t 1
     tkwait visibility .t
     update
@@ -1975,7 +1975,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu failsOnXQuarz} {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .t2
     toplevel .t -width 200 -height 200 -bg green
-- 
cgit v0.12


From 61165e438503f133f584ed8f3d7e29a6f91197ce Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 16 Oct 2023 20:41:29 +0000
Subject: Restore 6 'failsOnXQuarz' constraints. These tests fail at Github
 Actions for clang,--disable-aqua builds but not for me. This must mean that
 the cause is not XQuartz but the use of Xvfb.

---
 tests/unixWm.test | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 00a8268..2aca2ca 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -300,7 +300,7 @@ test unixWm-8.3 {icon windows} unix {
     toplevel .t -width 100 -height 30
     list [catch {wm iconwindow .t b c} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
-test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
+test unixWm-8.4 {icon windows} {unix failsOnUbuntu failsOnXQuarz} {
     destroy .t
     destroy .icon
     toplevel .t -width 100 -height 30
@@ -645,7 +645,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu failsOnXQuarz} {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -864,7 +864,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu failsOnXQuarz} {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
@@ -875,7 +875,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     set result
 } 0
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu failsOnXQuarz} {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
@@ -1446,7 +1446,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu failsOnXQuarz} {
     destroy .t
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1975,7 +1975,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu failsOnXQuarz} {
     destroy .t
     destroy .t2
     toplevel .t -width 200 -height 200 -bg green
-- 
cgit v0.12


From 1cbb8137261385ec4df232c81894eb5e6a73ec4a Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 17 Oct 2023 18:39:03 +0000
Subject: unixWm.test - Let unixWm-51.7 pass on Debian 11 by processing events
 while waiting a bit for the window to be restacked. At this point I get zero
 failures in wm.test and unixWm.test on Linux Debian 11.

---
 tests/unixWm.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 2aca2ca..17fe9de 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -2087,6 +2087,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 {
-- 
cgit v0.12