Account for test-cases which we already know are failing on Ubuntu

16 files changed, 16 insertions, 16 deletions

diff --git a/tests/bitmap.test b/tests/bitmap.test
index b0f0503..2b74c13 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -10,7 +10,7 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-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)]}]
 
 test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} testbitmap {
     set x gray25
diff --git a/tests/border.test b/tests/border.test
index 7899cd9..33bdfd0 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -14,7 +14,7 @@ if {[testConstraint pseudocolor8]} {
     wm geom .t +0+0
 }
 
-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)]}]
 
 test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} testborder {
     set x orange
diff --git a/tests/canvText.test b/tests/canvText.test
index 77eb735..f943525 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -21,7 +21,7 @@ set font "-adobe-times-medium-r-normal--*-200-*-*-*-*-*-*"
 set ay [font metrics $font -linespace]
 set ax [font measure $font 0]
 
-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)]}]
 
 foreach test {
     {-anchor nw nw xyz {bad anchor position "xyz": must be n, ne, e, se, s, sw, w, nw, or center}}
diff --git a/tests/cursor.test b/tests/cursor.test
index 2a1d274..90c308e 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -10,7 +10,7 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-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)]}]
 
 test cursor-1.1 {Tk_AllocCursorFromObj - converting internal reps} {testcursor} {
     set x watch
diff --git a/tests/focus.test b/tests/focus.test
index 62e00c8..7a35aa4 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -13,7 +13,7 @@ tcltest::loadTestedCommands
 button .b -text .b -relief raised -bd 2
 pack .b
 
-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)]}]
 
 proc focusSetup {} {
     catch {destroy .t}
diff --git a/tests/font.test b/tests/font.test
index 37e5739..a35c4db 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -17,7 +17,7 @@ update idletasks
 
 set defaultfontlist [font names]
 
-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)]}]
 
 proc getnondefaultfonts {} {
     global defaultfontlist
diff --git a/tests/pack.test b/tests/pack.test
index a71fe7b..b75d5b2 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -10,7 +10,7 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-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)]}]
 
 # Utility procedures:
 
diff --git a/tests/place.test b/tests/place.test
index e8419ea..07524fe 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -11,7 +11,7 @@ tcltest::loadTestedCommands
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
-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)]}]
 
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the features are tested.
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index e69e1d2..5de464d 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -38,7 +38,7 @@ proc getTroughSize {w} {
     }
 }
 
-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)]}]
 
 # XXX Note: this test file is woefully incomplete.  Right now there are
 # only bits and pieces of tests.  Please make this file more complete
diff --git a/tests/send.test b/tests/send.test
index 5bd1ade..fbf1555 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -15,7 +15,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint xhost [llength [auto_execok xhost]]
-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)]}]
 
 # Compute a script that will load Tk into a child interpreter.
 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 520b26b..8285fa8 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -79,7 +79,7 @@ wm positionfrom . user
 wm deiconify .
 update
 
-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)]}]
 
 # Some window managers (like olwm under SunOS 4.1.3) misbehave in a way
 # that tends to march windows off the top and left of the screen.  If
diff --git a/tests/textWind.test b/tests/textWind.test
index 8d81647..344687f 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -45,7 +45,7 @@ wm minsize . 1 1
 wm positionfrom . user
 wm deiconify .
 
-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)]}]
 
 test textWind-1.1 {basic tests of options} {fonts} {
     .t delete 1.0 end
diff --git a/tests/unixFont.test b/tests/unixFont.test
index f4cc3dd..5c22e3a 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -45,7 +45,7 @@ toplevel .b
 wm geom .b +0+0
 update idletasks
 
-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)]}]
 
 # Font should be fixed width and have chars missing below char 32, so can
 # test control char expansion and missing character code.
diff --git a/tests/unixWm.test b/tests/unixWm.test
index cd6394d..48f3e47 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -13,7 +13,7 @@ tcltest::loadTestedCommands
 
 namespace import -force ::tk::test:loadTkCommand
 
-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)]}]
 
 proc sleep ms {
     global x
diff --git a/tests/winfo.test b/tests/winfo.test
index b393b1a..ff7f23d 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -35,7 +35,7 @@ proc eatColors {w {options ""}} {
     update
 }
 
-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)]}]
 
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the winfo options are tested.
diff --git a/tests/wm.test b/tests/wm.test
index eeeea8d..ab2a7cc 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -27,7 +27,7 @@ proc stdWindow {} {
     update
 }
 
-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)]}]
 
 # [raise] and [lower] may return before the window manager has completed the
 # operation. The raiseDelay procedure idles for a while to give the operation