diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-23 09:52:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-23 09:52:04 (GMT) |
| commit | d859ef4d99e212a50d0a3917627f280ab14afe5f (patch) | |
| tree | 41f9bfc342c2835bd37aee3e96d54cbfbade2f3b /tests/font.test | |
| parent | e9d7f9d1730091e1812d22b78bf67f1c41d1bd50 (diff) | |
| parent | 3acc3fa16194242d5c2699b32871a3e91c1595be (diff) | |
| download | tk-d859ef4d99e212a50d0a3917627f280ab14afe5f.zip tk-d859ef4d99e212a50d0a3917627f280ab14afe5f.tar.gz tk-d859ef4d99e212a50d0a3917627f280ab14afe5f.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'tests/font.test')
| -rw-r--r-- | tests/font.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/font.test b/tests/font.test index 89780ba..cef8df2 100644 --- a/tests/font.test +++ b/tests/font.test @@ -14,7 +14,7 @@ tcltest::loadTestedCommands # Some tests require support for 4-byte UTF-8 sequences testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}] -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] |