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/font.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/font.test')
| -rw-r--r-- | tests/font.test | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/font.test b/tests/font.test index e4cd59b..56e2e50 100644 --- a/tests/font.test +++ b/tests/font.test @@ -15,7 +15,6 @@ tcltest::loadTestedCommands testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}] testConstraint utfcompat [expr {([string length "\U10000"] == 2) && [package vsatisfies [package provide Tcl] 8]}] 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"))}] set defaultfontlist [font names] @@ -2258,7 +2257,7 @@ test font-38.10 {ParseFontNameObj procedure: arguments} -body { font actual {times xyz xyz} } -returnCodes error -result {expected integer but got "xyz"} test font-38.11 {ParseFontNameObj procedure: stylelist loop} -constraints { - unixOrWin failsOnUbuntuNoXft + unixOrWin haveTimes12BoldItalicUnderlineOverstrikeFont } -body { lrange [font actual {times 12 bold italic overstrike underline}] 4 end } -result {-weight bold -slant italic -underline 1 -overstrike 1} @@ -2348,7 +2347,7 @@ test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup { } -cleanup { tk scaling $oldscale } -result 24 -test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed failsOnUbuntuNoXft} -setup { +test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed haveTimes12Font} -setup { set oldscale [tk scaling] } -body { tk scaling 0.5 |