diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-09 13:21:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-09 13:21:42 (GMT) |
| commit | cf57d7e6876d6ebdcef96d5f3ce5467072afae27 (patch) | |
| tree | 7cfbc45fe010bb34554f71cfc545dfe547fafc3b | |
| parent | 61924643ebb6fd356f0f905c837e4d2e8db72a63 (diff) | |
| download | tk-cf57d7e6876d6ebdcef96d5f3ce5467072afae27.zip tk-cf57d7e6876d6ebdcef96d5f3ce5467072afae27.tar.gz tk-cf57d7e6876d6ebdcef96d5f3ce5467072afae27.tar.bz2 | |
Mark failing test-cases. Add -disable-xft build with Tcl 8.7 on Linux
| -rw-r--r-- | .github/workflows/linux-with-tcl8-build.yml | 1 | ||||
| -rw-r--r-- | tests/entry.test | 6 | ||||
| -rw-r--r-- | tests/spinbox.test | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/linux-with-tcl8-build.yml b/.github/workflows/linux-with-tcl8-build.yml index ff66bc1..c8adba5 100644 --- a/.github/workflows/linux-with-tcl8-build.yml +++ b/.github/workflows/linux-with-tcl8-build.yml @@ -125,6 +125,7 @@ jobs: - "gcc" cfgopt: - "" + - "--disable-xft" - "--enable-symbols" steps: - name: Checkout diff --git a/tests/entry.test b/tests/entry.test index bfe8a72..57adf07 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -746,7 +746,7 @@ test entry-3.6 {EntryWidgetCmd procedure, "bbox" widget command} -constraints { destroy .e } -result {{19 5 7 13} {19 5 7 13}} test entry-3.7 {EntryWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e ; update idletasks @@ -759,7 +759,7 @@ test entry-3.7 {EntryWidgetCmd procedure, "bbox" widget command} -constraints { destroy .e } -result {19 5 12 13} test entry-3.8 {EntryWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e ; update idletasks @@ -782,7 +782,7 @@ test entry-3.9 {EntryWidgetCmd procedure, "bbox" widget command} -setup { destroy .e } -result "5 5 0 $cy" test entry-3.10 {EntryWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e ; update idletasks diff --git a/tests/spinbox.test b/tests/spinbox.test index 89cc111..5119a40 100644 --- a/tests/spinbox.test +++ b/tests/spinbox.test @@ -13,6 +13,7 @@ tcltest::loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] # For xscrollcommand set scrollInfo {} @@ -1083,7 +1084,7 @@ test spinbox-3.6 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraint destroy .e } -result {{19 5 7 13} {19 5 7 13}} test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e @@ -1096,7 +1097,7 @@ test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraint destroy .e } -result {19 5 12 13} test spinbox-3.8 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e @@ -1119,7 +1120,7 @@ test spinbox-3.9 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup { destroy .e } -result "5 5 0 $cy" test spinbox-3.10 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints { - fonts + fonts failsOnXQuarz } -setup { spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 pack .e |