summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-15 11:04:21 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-15 11:04:21 (GMT)
commitc5ca64f414a98be2d4e9a91e0cab554221369344 (patch)
treeec88de41f3c9fa0b9df859b6a67f1b0ed6d2bc94 /tests
parentdb4cdba82f0712063880e690953d4bd0caf6da4f (diff)
parentd5a1cc52cf08703de2efb17dbc8eb5cc48a94a9f (diff)
downloadtk-c5ca64f414a98be2d4e9a91e0cab554221369344.zip
tk-c5ca64f414a98be2d4e9a91e0cab554221369344.tar.gz
tk-c5ca64f414a98be2d4e9a91e0cab554221369344.tar.bz2
Merge 8.5
Diffstat (limited to 'tests')
-rw-r--r--tests/tk.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/tk.test b/tests/tk.test
index 9e088ce..f1a6b9a 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -10,7 +10,7 @@ eval tcltest::configure $argv
tcltest::loadTestedCommands
namespace import -force tcltest::test
-testConstraint failsOnQuarz [expr {![info exists ::env(MAC_CI)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
test tk-1.1 {tk command: general} -body {
tk
@@ -154,7 +154,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} -constraints failsOnQuarz -body {
+test tk-6.5 {tk inactive} -constraints failsOnXQuarz -body {
tk inactive reset
update
after 100