Re-enable --disable-aqua builds

tcltk · Aug 18, 2024 · fb6b958 · fb6b958
2 parents 375c557 + 3a8ae80
commit fb6b958
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -65,7 +65,7 @@ jobs:
           - 'mem'
         options:
           - '--enable-aqua'
-#          - '--disable-aqua'
+          - '--disable-aqua'
     defaults:
       run:
         shell: bash

diff --git a/tests/unixFont.test b/tests/unixFont.test
@@ -88,14 +88,14 @@ test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
     lappend x [lindex [font actual {-family "Times"}] 1]
 } {times times times}
 test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
-	{x11 noExceed hasCourierNew failsOnUbuntu} {
+	{x11 noExceed hasCourierNew failsOnUbuntu failsOnXQuarz} {
     set x {}
     lappend x [lindex [font actual {-family "Courier New"}] 1]
     lappend x [lindex [font actual {-family "Monaco"}] 1]
     lappend x [lindex [font actual {-family "Courier"}] 1]
 } {courier courier courier}
 test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
-	{x11 noExceed hasArial failsOnUbuntu} {
+	{x11 noExceed hasArial failsOnUbuntu failsOnXQuarz} {
     set x {}
     lappend x [lindex [font actual {-family "Arial"}] 1]
     lappend x [lindex [font actual {-family "Geneva"}] 1]

diff --git a/tests/unixSelect.test b/tests/unixSelect.test
@@ -14,6 +14,8 @@ namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
+
 global longValue selValue selInfo
 
 set selValue {}
@@ -124,7 +126,7 @@ test unixSelect-1.1 {TkSelGetSelection procedure: simple i18n text} -constraints
 } -result 4
 
 test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -constraints {
-    x11
+    x11 failsOnXQuarz
 } -setup {
     setupbg
 } -body {
@@ -318,7 +320,7 @@ test unixSelect-1.12 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
 } -result [string repeat x 3999]ü[string repeat x 4000]
 
 test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
-    x11
+    x11 failsOnXQuarz
 } -setup {
     destroy .e
     setupbg
@@ -334,7 +336,7 @@ test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -con
 } -result 5
 
 test unixSelect-1.14 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
-    x11
+    x11 failsOnXQuarz
 } -setup {
     setupbg
 } -body {

diff --git a/tests/wm.test b/tests/wm.test
@@ -1563,7 +1563,9 @@ deleteWindows
 
 test wm-stackorder-3.1 {unmapped toplevel} -constraints {failsOnUbuntu failsOnXQuarz} -body {
     toplevel .t1 ; update
+    raiseDelay
     toplevel .t2 ; update
+    raiseDelay
     wm iconify .t1
     raiseDelay
     wm stackorder .