summaryrefslogtreecommitdiffstats
path: root/tests/border.test
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-28 07:14:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-28 07:14:00 (GMT)
commit7cd7731a93610c00e44c811f86b7afd62e83b82e (patch)
tree8f5b4337710208c54369ac2ac3a1a37844c45c2e /tests/border.test
parent8e15d163574288d0f72ed5fc1535a9ebaee26238 (diff)
parentd1e2513a1184139c90d858f109d8ea796a64675e (diff)
downloadtk-7cd7731a93610c00e44c811f86b7afd62e83b82e.zip
tk-7cd7731a93610c00e44c811f86b7afd62e83b82e.tar.gz
tk-7cd7731a93610c00e44c811f86b7afd62e83b82e.tar.bz2
Update to xcode12 and gcc-10. X11 test failures on Ubuntu now cause Travis build failures.
Diffstat (limited to 'tests/border.test')
-rw-r--r--tests/border.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/border.test b/tests/border.test
index 5b2155d..7899cd9 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -14,6 +14,8 @@ if {[testConstraint pseudocolor8]} {
wm geom .t +0+0
}
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} testborder {
set x orange
lindex $x 0
@@ -102,7 +104,7 @@ test border-3.4 {Tk_Free3DBorder - unlinking from list} {pseudocolor8 testborder
lappend result [testborder purple]
} {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
-test border-4.1 {FreeBorderObjProc} testborder {
+test border-4.1 {FreeBorderObjProc} {testborder failsOnUbuntu} {
destroy .b
set x [format purple]
button .b -bg $x -text .b1