diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-08 17:22:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-08 17:22:47 (GMT) |
| commit | 758da8219845218afd2e7c3f4585925057b8e704 (patch) | |
| tree | 455bbdd915f11f6190190660c6cd689410674e80 /tests/font.test | |
| parent | dd115bc874fa009623fcc254a5609708d53564e7 (diff) | |
| parent | 16578490e25354e6e91563c1da211b9cb1a3151c (diff) | |
| download | tk-758da8219845218afd2e7c3f4585925057b8e704.zip tk-758da8219845218afd2e7c3f4585925057b8e704.tar.gz tk-758da8219845218afd2e7c3f4585925057b8e704.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'tests/font.test')
| -rw-r--r-- | tests/font.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/font.test b/tests/font.test index 1aa3a21..656ad55 100644 --- a/tests/font.test +++ b/tests/font.test @@ -3,7 +3,7 @@ # standard white-box fashion for Tcl tests. # # Copyright © 1996-1998 Sun Microsystems, Inc. -# Copyright © 1998-1999 by Scriptics Corporation. +# Copyright © 1998-1999 Scriptics Corporation. # All rights reserved. package require tcltest 2.2 @@ -14,7 +14,7 @@ tcltest::loadTestedCommands # Some tests require support for 4-byte UTF-8 sequences 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(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] +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] @@ -2340,7 +2340,7 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} -body { } -result [font actual {times 0} -family] -test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntuNoXft -setup { +test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntu -setup { set oldscale [tk scaling] } -body { tk scaling 0.5 @@ -2364,7 +2364,7 @@ test font-45.1 {TkFontGetAliasList: no match} -body { test font-45.2 {TkFontGetAliasList: match} -constraints win -body { font actual {times 10} -family } -result {times} -test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body { +test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed failsOnUbuntu} -body { if {[font actual {{times new roman} 10} -family] eq "Times New Roman"} { # avoid test failure on systems that have a real "times new roman" font set res 1 |