diff options
| -rw-r--r-- | .github/workflows/mac-build.yml | 2 | ||||
| -rw-r--r-- | tests/tk.test | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index e15ff80..41da00c 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -136,8 +136,6 @@ jobs: echo "::error::Failure during Test" exit 1 } - env: - MAC_CI: 1 - name: Carry out trial installation run: | make install || { 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 |