Merge core-9-0-branchcore-tip-716

1 files changed, 4 insertions, 7 deletions

diff --git a/tests/pack.test b/tests/pack.test
index db1bd88..3a332ed 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -11,9 +11,6 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
-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" }]
-
 # Create some test windows.
 
 destroy .pack
@@ -1536,7 +1533,7 @@ test pack-17.2 {PackLostContentProc procedure} -setup {
 
 # Tests pack-18.1.1 and pack-18.2 are constrained with failsOnUbuntu
 # because they are failing in the GitHub CI environment, using Linux Ubuntu.
-# These tests are also constrained with failsOnXQuarz because they fail
+# These tests are also constrained with failsOnXQuartz because they fail
 # on macOS when building with clang --disable-aqua (which uses XQuartz)
 # (this is the case both at GitHub CI and on a real Mac).
 # Analysis shows that, on both cases, WaitForMapNotify is giving up on
@@ -1559,7 +1556,7 @@ test pack-17.2 {PackLostContentProc procedure} -setup {
 # colored.  So, evidently, even though the size changes are honored,
 # the window is sometimes not completely configured.
 test pack-18.1.1 {unmap content when container unmapped} -constraints {
-    macOrUnix failsOnUbuntu failsOnXQuarz
+    macOrUnix failsOnUbuntu failsOnXQuartz
 } -setup {
     destroy {*}[winfo children .pack]
     # adjust the position of .pack before test to avoid a screen switch
@@ -1605,7 +1602,7 @@ test pack-18.1.2 {unmap content when container unmapped} -constraints {
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 1}
 
-test pack-18.2 {unmap content when container unmapped} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
+test pack-18.2 {unmap content when container unmapped} -constraints {failsOnUbuntu failsOnXQuartz} -setup {
     destroy {*}[winfo children .pack]
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
@@ -1753,7 +1750,7 @@ test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagat
     bind . <<NoManagedChild>> {}
     destroy .1
 } -result 0
-
+
 # cleanup
 cleanupTests
 return