diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-11-27 11:32:30 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-11-27 11:32:30 (GMT) |
| commit | a27551234375d448f5c75d5f068a651b32b9443b (patch) | |
| tree | a7ca7d3274ba8f43e52891b01c5aec932055ddef /tests/unixFont.test | |
| parent | a15e86ba8fe09a9d4dacaddb52626a08ec634cfb (diff) | |
| parent | 1d9db21e6c8179d6b535f3dc448540dcb9a097fb (diff) | |
| download | tk-a27551234375d448f5c75d5f068a651b32b9443b.zip tk-a27551234375d448f5c75d5f068a651b32b9443b.tar.gz tk-a27551234375d448f5c75d5f068a651b32b9443b.tar.bz2 | |
Merge core-8-6-branch. Resolve conflicts.
Diffstat (limited to 'tests/unixFont.test')
| -rw-r--r-- | tests/unixFont.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/unixFont.test b/tests/unixFont.test index ee3d36a..0af3065 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -17,7 +17,6 @@ eval tcltest::configure $argv 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" }] if {[tk windowingsystem] eq "x11"} { @@ -118,7 +117,7 @@ test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {x11 test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed failsOnUbuntu} { lindex [font actual {-family courier}] 1 } {courier} -test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {x11 failsOnUbuntuNoXft} { +test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {x11 haveCourier37Font} { lindex [font actual {-family courier -size 37}] 3 } 37 test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} x11 { |