diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-12 06:09:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-12 06:09:22 (GMT) |
| commit | d132f6a77e1eef979d0c0d3809383546184fcb27 (patch) | |
| tree | 96b4e2feb35dbe8fe183cac17ce50857d094c967 /tests/entry.test | |
| parent | 327ab1ecf903217147e6cbbc0f33f4813ca67f56 (diff) | |
| parent | cb3a0ab0484b6747c2055c04530979b75363ca54 (diff) | |
| download | tk-d132f6a77e1eef979d0c0d3809383546184fcb27.zip tk-d132f6a77e1eef979d0c0d3809383546184fcb27.tar.gz tk-d132f6a77e1eef979d0c0d3809383546184fcb27.tar.bz2 | |
Merge trunk
Diffstat (limited to 'tests/entry.test')
| -rw-r--r-- | tests/entry.test | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/entry.test b/tests/entry.test index 7ee50dd..6be21e6 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -11,6 +11,10 @@ namespace import ::tcltest::* eval tcltest::configure $argv tcltest::loadTestedCommands +testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] +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 {} proc scroll args { @@ -1701,7 +1705,7 @@ test entry-5.7 {ConfigureEntry procedure} -setup { test entry-5.8 {ConfigureEntry procedure} -constraints { - fonts + fonts failsOnXQuarz } -setup { entry .e -borderwidth 2 -highlightthickness 2 pack .e @@ -2328,7 +2332,7 @@ test entry-8.17 {DeleteChars procedure} -setup { } -cleanup { destroy .e } -result 4 -test entry-8.18 {DeleteChars procedure} -setup { +test entry-8.18 {DeleteChars procedure} -constraints failsOnUbuntuNoXft -setup { entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 pack .e focus .e |