From 65572b6aec4b3b2c81e579d3efd302ec7982ea56 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Sep 2020 14:06:35 +0000
Subject: Experiment: See if we can have a Travis build fail when a test-case
 fails

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd5085e..5646bf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test
+        - make test-classic "-file color.test" >out-classic.txt
+        - cat out-classic.txt
+        - grep -q "Failed\t0" out-classic.txt
+        - make test-ttk "-file entry.test" >out-ttk.txt
+        - cat out-ttk.txt
+        - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
-- 
cgit v0.12


From ae1b79d466c7d533c3bb7722d7e19860461055fa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 09:33:54 +0000
Subject: Add TESTFLAGS= part

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5646bf7..3699bbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,10 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-classic "-file color.test" >out-classic.txt
+        - make test-classic TESTFLAGS="-file color.test" >out-classic.txt
         - cat out-classic.txt
         - grep -q "Failed\t0" out-classic.txt
-        - make test-ttk "-file entry.test" >out-ttk.txt
+        - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
         - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
-- 
cgit v0.12


From 88a38acd049b4cef382444545c2e48764f4a43e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 10:33:56 +0000
Subject: Mark many testcases with "failsOnUbuntu" (Not all, I still want to
 see the remainings failing)

---
 .travis.yml          |  6 +++---
 tests/bitmap.test    |  4 +++-
 tests/border.test    |  4 +++-
 tests/canvText.test  |  1 +
 tests/cursor.test    |  4 +++-
 tests/focus.test     |  4 +++-
 tests/font.test      | 20 +++++++++++---------
 tests/pack.test      |  6 ++++--
 tests/place.test     |  5 +++--
 tests/safe.test      | 14 +++-----------
 tests/scrollbar.test | 12 +++++++-----
 tests/textDisp.test  |  4 +++-
 tests/textWind.test  |  4 +++-
 tests/unixFont.test  | 30 ++++++++++++++++--------------
 tests/unixWm.test    | 22 ++++++++++++----------
 tests/winfo.test     |  6 ++++--
 tests/wm.test        | 18 ++++++++++--------
 17 files changed, 92 insertions(+), 72 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3699bbb..0ac80ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-classic TESTFLAGS="-file color.test" >out-classic.txt
-        - cat out-classic.txt
-        - grep -q "Failed\t0" out-classic.txt
         - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
         - grep -q "Failed\t0" out-ttk.txt
+        - make test-classic >out-classic.txt
+        - cat out-classic.txt
+        - grep -q "Failed\t0" out-classic.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 05086c3..b0f0503 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -10,6 +10,8 @@ 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)]}]
+
 test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} testbitmap {
     set x gray25
     lindex $x 0
@@ -64,7 +66,7 @@ test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} testbitmap {
     lappend result [testbitmap questhead]
 } {{{3 1}} {{2 1}} {{1 1}} {}}
 
-test bitmap-4.1 {FreeBitmapObjProc} testbitmap {
+test bitmap-4.1 {FreeBitmapObjProc} {testbitmap failsOnUbuntu} {
     destroy .b
     set x [format questhead]
     button .b -bitmap $x
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
diff --git a/tests/canvText.test b/tests/canvText.test
index 7608f86..f79e6df 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -21,6 +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)]}]
 
 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 02ad78c..2a1d274 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -10,6 +10,8 @@ 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)]}]
+
 test cursor-1.1 {Tk_AllocCursorFromObj - converting internal reps} {testcursor} {
     set x watch
     lindex $x 0
@@ -105,7 +107,7 @@ test cursor-3.1 {Tk_FreeCursorFromObj - reference counts} {testcursor} {
     lappend result [testcursor heart]
 } {{{3 1}} {{2 1}} {{1 1}} {}}
 
-test cursor-4.1 {FreeCursorObjProc} {testcursor} {
+test cursor-4.1 {FreeCursorObjProc} {testcursor failsOnUbuntu} {
     destroy .b
     set x [format heart]
     button .b -cursor $x
diff --git a/tests/focus.test b/tests/focus.test
index eee0ee6..62e00c8 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -13,6 +13,8 @@ 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)]}]
+
 proc focusSetup {} {
     catch {destroy .t}
     toplevel .t
@@ -511,7 +513,7 @@ test focus-4.4 {TkFocusDeadWindow procedure} {unix testwrapper} {
 
 setupbg
 test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} \
-	{unix testwrapper secureserver} {
+	{unix testwrapper secureserver failsOnUbuntu} {
     focusSetup
     focus -force .t
     update
diff --git a/tests/font.test b/tests/font.test
index 6175b32..c3f6413 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -17,6 +17,8 @@ update idletasks
 
 set defaultfontlist [font names]
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc getnondefaultfonts {} {
     global defaultfontlist
     set nondeffonts [list ]
@@ -154,7 +156,7 @@ test font-4.8 {font command: actual: all attributes} {
     # not (objc > 3) so objPtr = NULL
     lindex [font actual {-family times}] 0
 } {-family}
-test font-4.9 {font command: actual} {unix noExceed} {
+test font-4.9 {font command: actual} {unix noExceed failsOnUbuntu} {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
 } {times}
@@ -318,7 +320,7 @@ test font-8.3 {font command: families: arguments} {
     # (objc - skip != 2) when skip == 2
     list [catch {font families -displayof . xyz} msg] $msg
 } {1 {wrong # args: should be "font families ?-displayof window?"}}
-test font-8.4 {font command: families} {
+test font-8.4 {font command: families} failsOnUbuntu {
     # TkpGetFontFamilies()
     regexp -nocase times [font families]
 } {1}
@@ -339,7 +341,7 @@ test font-9.4 {font command: measure: arguments} {noExceed} {
     # (tkfont == NULL)
     list [catch {font measure "\{xyz" abc} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
-test font-9.5 {font command: measure} {
+test font-9.5 {font command: measure} failsOnUbuntu {
     # Tk_TextWidth()
     expr [font measure $fixed "abcdefg"]==[font measure $fixed "a"]*7
 } {1}
@@ -388,7 +390,7 @@ test font-10.8 {font command: metrics: bad metric} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
     list [catch {font metrics $fixed -xyz} msg] $msg
 } {1 {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}}
-test font-10.9 {font command: metrics: get individual metrics} {
+test font-10.9 {font command: metrics: get individual metrics} failsOnUbuntu {
     font metrics $fixed -ascent
     font metrics $fixed -descent
     font metrics $fixed -linespace
@@ -628,7 +630,7 @@ test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} {
     list [lindex [font actual xyz] 0] [lindex $x 0]
 } {-family -family}
 
-test font-18.1 {FreeFontObjProc} testfont {
+test font-18.1 {FreeFontObjProc} {testfont failsOnUbuntu} {
     destroy .b1
     set x [format {Courier 12}]
     button .b1 -font $x
@@ -696,7 +698,7 @@ test font-21.8 {Tk_PostscriptFontName procedure: spaces} unix {
 	set x {LucidaBright}
     }
 } {LucidaBright}
-test font-21.9 {Tk_PostscriptFontName procedure: spaces} unix {
+test font-21.9 {Tk_PostscriptFontName procedure: spaces} {unix failsOnUbuntu} {
     psfontname "{new century schoolbook} 10"
 } {NewCenturySchlbk-Roman}
 set i 10
@@ -795,7 +797,7 @@ test font-24.4 {Tk_ComputeTextLayout: calls Tk_MeasureChars} {
     .b.l config -text "000\n000"
     getsize
 } "[expr $ax*3] [expr $ay*2]"
-test font-24.5 {Tk_ComputeTextLayout: break line} {
+test font-24.5 {Tk_ComputeTextLayout: break line} failsOnUbuntu {
     .b.l config -text "000\t00000" -wrap [expr 9*$ax]
     set x [getsize]
     .b.l config -wrap 0
@@ -1110,7 +1112,7 @@ test font-31.6 {Tk_IntersectTextLayout procedure: ignore spaces at eol} {
     set x
 } {}
 
-test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} {
+test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} failsOnUbuntu {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
 
@@ -1346,7 +1348,7 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} {
 
 set oldscale [tk scaling]
 tk scaling 0.5
-test font-44.1 {TkFontGetPixels: size < 0} {
+test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
 } {24}
 test font-44.2 {TkFontGetPoints: size >= 0} {noExceed} {
diff --git a/tests/pack.test b/tests/pack.test
index 83525a1..a71fe7b 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -10,6 +10,8 @@ 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)]}]
+
 # Utility procedures:
 
 proc pack1 {args} {
@@ -1011,7 +1013,7 @@ test pack-17.1 {PackLostSlaveProc procedure} {
 	[catch {pack info .pack.a} msg] $msg
 } {place 20x40+40+10 1 {window ".pack.a" isn't packed}}
 
-test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
+test pack-18.1 {unmap slaves when master unmapped} {tempNotPc failsOnUbuntu} {
 
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
@@ -1039,7 +1041,7 @@ test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
     update
     lappend result [winfo ismapped .pack.a]
 } {1 0 200 75 0 1}
-test pack-18.2 {unmap slaves when master unmapped} {
+test pack-18.2 {unmap slaves when master unmapped} failsOnUbuntu {
 
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
diff --git a/tests/place.test b/tests/place.test
index cc37e48..e8419ea 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -11,6 +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)]}]
 
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the features are tested.
@@ -197,7 +198,7 @@ test place-7.10 {ReconfigurePlacement procedure, computing size} {
 } {30 60}
 
 
-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} {
+test place-8.1 {MasterStructureProc, mapping and unmapping slaves} failsOnUbuntu {
     place forget .t.f2
     place forget .t.f
     place .t.f2 -relx 1.0 -rely 1.0 -anchor sw
@@ -213,7 +214,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} {
     update
     lappend result [winfo ismapped .t.f2]
 } {1 0 40 30 0 1}
-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} {
+test place-8.2 {MasterStructureProc, mapping and unmapping slaves} failsOnUbuntu {
     place forget .t.f2
     place forget .t.f
     place .t.f -x 0 -y 0 -width 200 -height 100
diff --git a/tests/safe.test b/tests/safe.test
index 9e502ce..432bc01 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -30,14 +30,6 @@ tcltest::loadTestedCommands
 ## Ensure that any changes that occured to tk.tcl will work or
 ## are properly prevented in a safe interpreter.  -- hobbs
 
-# The set of hidden commands is platform dependent:
-
-if {[string equal $tcl_platform(platform) "windows"]} {
-    set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile tk_messageBox toplevel unload wm}
-} else {
-    set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection send socket source toplevel unload wm}
-}
-
 set saveAutoPath $::auto_path
 set auto_path [list [info library] $::tk_library]
 
@@ -48,14 +40,14 @@ test safe-1.1 {Safe Tk loading into an interpreter} {
     set x {}
     set x
 } ""
-test safe-1.2 {Safe Tk loading into an interpreter} {
+test safe-1.2 {Safe Tk loading into an interpreter} -body {
     catch {safe::interpDelete a}
     safe::interpCreate a
     safe::loadTk a
     set l [lsort [interp hidden a]]
     safe::interpDelete a
     set l
-} $hidden_cmds
+} -match glob -result {bell cd clipboard encoding exec exit fconfigure*glob grab load menu open pwd selection send socket source*toplevel unload wm}
 test safe-1.3 {Safe Tk loading into an interpreter} -body {
     catch {safe::interpDelete a}
     safe::interpCreate a
@@ -63,7 +55,7 @@ test safe-1.3 {Safe Tk loading into an interpreter} -body {
     set l [lsort [interp aliases a]]
     safe::interpDelete a
     set l
-} -match glob -result {*encoding*exit*file*load*source*}
+} -match glob -result {*encoding*exit*load*source*}
 
 test safe-2.1 {Unsafe commands not available} {
     catch {safe::interpDelete a}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 6920228..8b631fa 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -38,6 +38,8 @@ proc getTroughSize {w} {
     }
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # XXX Note: this test file is woefully incomplete.  Right now there are
 # only bits and pieces of tests.  Please make this file more complete
 # as you fix bugs and add features.
@@ -255,13 +257,13 @@ test scrollbar-3.35 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 4 21]
 } [format %.6g [expr (21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
        /([getTroughSize .s] - 1)]]
-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {unix failsOnUbuntu} {
     format {%.6g} [.s fraction 4 179]
 } {1}
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr 200 - [testmetrics cyvscroll .s]]]
 } {1}
-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {unix failsOnUbuntu} {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
 test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
@@ -458,7 +460,7 @@ test scrollbar-6.10 {ScrollbarPosition procedure} {
 test scrollbar-6.11 {ScrollbarPosition procedure} unix {
     .s identify 8 4
 } {arrow1}
-test scrollbar-6.12 {ScrollbarPosition procedure} unix {
+test scrollbar-6.12 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
@@ -516,7 +518,7 @@ test scrollbar-6.28 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [winfo height .s] \
 						 - [testmetrics cyvscroll .s] - 1]
 } {trough2}
-test scrollbar-6.29 {ScrollbarPosition procedure} unix {
+test scrollbar-6.29 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 8 180
 } {arrow2}
 test scrollbar-6.30 {ScrollbarPosition procedure} unix {
@@ -532,7 +534,7 @@ test scrollbar-6.33 {ScrollbarPosition procedure} win {
 test scrollbar-6.34 {ScrollbarPosition procedure} unix {
     .s identify 4 100
 } {trough2}
-test scrollbar-6.35 {ScrollbarPosition procedure} unix {
+test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 18 100
 } {trough2}
 test scrollbar-6.37 {ScrollbarPosition procedure} win {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index aed22c1..8d130ae 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -79,6 +79,8 @@ wm positionfrom . user
 wm deiconify .
 update
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # 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
 # this happens, some tests will fail because parts of the window will
@@ -2512,7 +2514,7 @@ test textDisp-19.7 {GetYView procedure} {
     update; after 1; update
     set x $scrollInfo
 } {0.125 0.75}
-test textDisp-19.8 {GetYView procedure} {
+test textDisp-19.8 {GetYView procedure} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1"
diff --git a/tests/textWind.test b/tests/textWind.test
index 6eb9b0f..c665006 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -45,6 +45,8 @@ 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)]}]
+
 test textWind-1.1 {basic tests of options} {fonts} {
     .t delete 1.0 end
     .t insert end "This is the first line"
@@ -493,7 +495,7 @@ test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} {textf
     update
     lappend msg [.t bbox 1.5]
 } [list {{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}} [list 40 [expr {11+$fixedDiff/2}] 0 0]]
-test textWind-10.6.1 {EmbWinLayoutProc procedure, error in creating window} {
+test textWind-10.6.1 {EmbWinLayoutProc procedure, error in creating window} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     catch {destroy .t2}
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 440fdc5..8129279 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -45,6 +45,8 @@ 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)]}]
+
 # Font should be fixed width and have chars missing below char 32, so can
 # test control char expansion and missing character code.
 
@@ -69,7 +71,7 @@ proc getsize {} {
 test unixfont-1.1 {TkpGetNativeFont procedure: not native} {unix noExceed} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
-test unixfont-1.2 {TkpGetNativeFont procedure: native} unix {
+test unixfont-1.2 {TkpGetNativeFont procedure: native} {unix failsOnUbuntu} {
     font measure fixed 0
 } {6}
 
@@ -78,21 +80,21 @@ test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} unix {
     set x {}
 } {}
 test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
-	{unix noExceed hasTimesNew} {
+	{unix noExceed hasTimesNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Times New Roman"}] 1]
     lappend x [lindex [font actual {-family "New York"}] 1]
     lappend x [lindex [font actual {-family "Times"}] 1]
 } {times times times}
 test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
-	{unix noExceed hasCourierNew} {
+	{unix noExceed hasCourierNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Courier New"}] 1]
     lappend x [lindex [font actual {-family "Monaco"}] 1]
     lappend x [lindex [font actual {-family "Courier"}] 1]
 } {courier courier courier}
 test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
-	{unix noExceed hasArial} {
+	{unix noExceed hasArial failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Arial"}] 1]
     lappend x [lindex [font actual {-family "Geneva"}] 1]
@@ -102,16 +104,16 @@ test unixfont-2.5 {TkpGetFontFromAttributes procedure: fallback} unix {
     font actual {-xyz-xyz-*-*-*-*-*-*-*-*-*-*-*-*}
     set x {}
 } {}
-test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} unix {
+test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} {unix failsOnUbuntu} {
     lindex [font actual {-family fixed -size 10}] 1
 } {fixed}
 test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} unix {
     # no test available
 } {}
-test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} unix {
+test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {unix failsOnUbuntu} {
     lindex [font actual {-family fixed -size 31}] 1
 } {fixed}
-test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed} {
+test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
 test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix {
@@ -166,11 +168,11 @@ test unixfont-5.7 {Tk_MeasureChars procedure: already saw space in line} unix {
     .b.l config -text "000000     00000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} unix {
+test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} {unix failsOnUbuntu} {
     .b.l config -text "00  000     00000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} unix {
+test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($ax*2.5)],1
@@ -186,7 +188,7 @@ test unixfont-5.11 {Tk_MeasureChars: TK_AT_LEAST_ONE + not even one char fit!} u
     .b.l config -wrap $a
     set x
 } "$ax [expr $ay*6]"
-test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} unix {
+test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} {unix failsOnUbuntu} {
     .b.l config -text "000   \n000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
@@ -253,7 +255,7 @@ test unixfont-8.3 {AllocFont procedure: can't parse info from name} unix {
     catch {unset fontArray}
     set result
 } {-family -overstrike -size -slant -underline -weight}
-test unixfont-8.4 {AllocFont procedure: classify characters} unix {
+test unixfont-8.4 {AllocFont procedure: classify characters} {unix failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\u4000"]   ;# 6
     incr x [font measure $courier "\002"]   ;# 4
@@ -264,7 +266,7 @@ test unixfont-8.4 {AllocFont procedure: classify characters} unix {
 test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} unix {
     font metrics $courier -fixed
 } {1}
-test unixfont-8.6 {AllocFont procedure: setup widths of special chars} unix {
+test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {unix failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
     incr x [font measure $courier "\002"]   ;# 4
@@ -292,7 +294,7 @@ test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} unix {
     set x {}
 } {}
 
-test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} unix {
+test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\a0"
     set x {}
@@ -301,7 +303,7 @@ test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} unix {
     lappend x [.b.c index $t @[expr $ax*2],0]
     lappend x [.b.c index $t @[expr $ax*3],0]
 } {0 1 1 2}
-test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} unix {
+test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\0010"
     set x {}
diff --git a/tests/unixWm.test b/tests/unixWm.test
index d579fc7..7c427ec 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -13,6 +13,8 @@ tcltest::loadTestedCommands
 
 namespace import -force ::tk::test:loadTkCommand
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc sleep ms {
     global x
     after $ms {set x 1}
@@ -269,7 +271,7 @@ test unixWm-8.3 {icon windows} unix {
     toplevel .t -width 100 -height 30
     list [catch {wm iconwindow .t b c} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
-test unixWm-8.4 {icon windows} unix {
+test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .icon
     toplevel .t -width 100 -height 30
@@ -388,7 +390,7 @@ test unixWm-9.2 {TkWmMapWindow procedure, command property} {unix testwrapper} {
 } {test
 command
 }
-test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} unix {
+test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 100 -height 300 -bg blue
     wm geom .t +0+0
@@ -615,7 +617,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} unix {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -828,7 +830,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
@@ -839,7 +841,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {0}
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
@@ -1405,7 +1407,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1578,7 +1580,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1606,7 +1608,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
@@ -1753,7 +1755,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
 
 deleteWindows
 wm iconify .
-test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} unix {
+test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} {unix failsOnUbuntu} {
     deleteWindows
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +40+0
@@ -1910,7 +1912,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .t2
     sleep 500		;# Give window manager time to catch up.
diff --git a/tests/winfo.test b/tests/winfo.test
index 50decf5..b393b1a 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -35,6 +35,8 @@ proc eatColors {w {options ""}} {
     update
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the winfo options are tested.
 
@@ -218,7 +220,7 @@ test winfo-9.2 {"winfo viewable" command} {
 test winfo-9.3 {"winfo viewable" command} {
     winfo viewable .
 } {1}
-test winfo-9.4 {"winfo viewable" command} {
+test winfo-9.4 {"winfo viewable" command} failsOnUbuntu {
     wm iconify .
     winfo viewable .
 } {0}
@@ -239,7 +241,7 @@ test winfo-9.6 {"winfo viewable" command} {
     update
     list [winfo viewable .f1] [winfo viewable .f1.f2]
 } {0 0}
-test winfo-9.7 {"winfo viewable" command} {
+test winfo-9.7 {"winfo viewable" command} failsOnUbuntu {
     deleteWindows
     frame .f1 -width 100 -height 100 -relief raised -bd 2
     place .f1 -x 0 -y 0
diff --git a/tests/wm.test b/tests/wm.test
index 15ceb2f..eeeea8d 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -27,6 +27,8 @@ proc stdWindow {} {
     update
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # [raise] and [lower] may return before the window manager has completed the
 # operation. The raiseDelay procedure idles for a while to give the operation
 # a chance to complete.
@@ -805,7 +807,7 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup {
     destroy .t2 .r.f
 } -result {can't iconify .t2: it is an embedded window}
 
-test wm-iconify-3.1 {iconify behavior} -body {
+test wm-iconify-3.1 {iconify behavior} -constraints failsOnUbuntu -body {
     toplevel .t2
     wm geom .t2 -0+0
     update
@@ -1404,7 +1406,7 @@ test wm-stackorder-2.7 {stacking order: no children returns self} -setup {
 
 deleteWindows
 
-test wm-stackorder-3.1 {unmapped toplevel} -body {
+test wm-stackorder-3.1 {unmapped toplevel} -constraints failsOnUbuntu -body {
     toplevel .t1 ; update
     toplevel .t2 ; update
     wm iconify .t1
@@ -1690,7 +1692,7 @@ test wm-transient-3.3 {withdraw/deiconify on the master
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if master is iconic} -body {
+        when mapped if master is iconic} -constraints failsOnUbuntu -body {
     toplevel .master
     wm iconify .master
     update
@@ -1702,7 +1704,7 @@ test wm-transient-4.1 {transient toplevel is withdrawn
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.2 {already mapped transient toplevel
-        is withdrawn if master is iconic} -body {
+        is withdrawn if master is iconic} -constraints failsOnUbuntu -body {
     toplevel .master
     wm iconify .master
     update
@@ -1715,7 +1717,7 @@ test wm-transient-4.2 {already mapped transient toplevel
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.3 {iconify/deiconify on the master
-        does a withdraw/deiconify on the transient} -setup {
+        does a withdraw/deiconify on the transient} -constraints failsOnUbuntu -setup {
     set results [list]
 } -body {
     toplevel .master
@@ -1891,7 +1893,7 @@ test wm-transient-7.5 {Reassign transient, destroy transient} -body {
     deleteWindows
 }
 
-test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
+test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints failsOnUbuntu -setup {
     deleteWindows
     set result {}
 } -body {
@@ -1968,7 +1970,7 @@ test wm-state-2.7 {state change before map} -body {
 } -cleanup {
     deleteWindows
 } -result {iconic}
-test wm-state-2.8 {state change after map} -body {
+test wm-state-2.8 {state change after map} -constraints failsOnUbuntu -body {
     toplevel .t
     update
     wm state .t iconic
@@ -1976,7 +1978,7 @@ test wm-state-2.8 {state change after map} -body {
 } -cleanup {
     deleteWindows
 } -result {iconic}
-test wm-state-2.9 {state change after map} -body {
+test wm-state-2.9 {state change after map} -constraints failsOnUbuntu -body {
     toplevel .t
     update
     wm iconify .t
-- 
cgit v0.12


From f05d35b656076f1289333777861f981fe8c44c13 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 10:51:31 +0000
Subject: Don't set ERROR_ON_FAILURES, it doesn't work for Tk. no unset
 hidden_cmds

---
 .travis.yml     | 2 --
 tests/safe.test | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ac80ca..0a63e50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,8 +184,6 @@ before_install:
   - cd ${BUILD_DIR}
 install:
   - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
-before_script:
-  - export ERROR_ON_FAILURES=1
 script:
   - make binaries libraries tktest
   - make install
diff --git a/tests/safe.test b/tests/safe.test
index 432bc01..d5488dc 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -203,6 +203,5 @@ test safe-7.1 {canvas printing} {
 
 # cleanup
 set ::auto_path $saveAutoPath
-unset hidden_cmds
 cleanupTests
 return
-- 
cgit v0.12


From 5dd5e3ad85119209cd8bbe431f51488fbc67b2e2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 12:29:50 +0000
Subject: testcase cleanup

---
 tests/font.test    |  96 +++++++++++++-------------
 tests/safe.test    | 170 +++++++++++++++++++++++++--------------------
 tests/tk.test      | 198 +++++++++++++++++++++++++++++------------------------
 tests/unixWm.test  |   8 +--
 tests/winFont.test |  20 +++---
 tests/winMenu.test |   4 +-
 tests/winWm.test   |  16 ++---
 7 files changed, 275 insertions(+), 237 deletions(-)

diff --git a/tests/font.test b/tests/font.test
index c3f6413..fbd0a52 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -140,7 +140,7 @@ test font-4.3 {font command: actual: arguments} {
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
 test font-4.4 {font command: actual: displayof specified, so skip to next} {
     catch {font actual xyz -displayof . -size}
-} {0}
+} 0
 test font-4.5 {font command: actual: displayof specified, so skip to next} {
     lindex [font actual xyz -displayof .] 0
 } {-family}
@@ -148,7 +148,7 @@ test font-4.6 {font command: actual: arguments} {
     # (objc - skip > 4) when skip == 2
     list [catch {font actual xyz -displayof . abc def} msg] $msg
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
-test font-4.7 {font command: actual: arguments} {noExceed} {
+test font-4.7 {font command: actual: arguments} noExceed {
     # (tkfont == NULL)
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -159,7 +159,7 @@ test font-4.8 {font command: actual: all attributes} {
 test font-4.9 {font command: actual} {unix noExceed failsOnUbuntu} {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
-} {times}
+} times
 test font-4.10 {font command: actual} win {
     # (objc > 3) so objPtr = objv[3 + skip]
     font actual {-family times} -family
@@ -215,19 +215,19 @@ test font-6.1 {font command: create: make up name} {
     setup
     font create
     expr {"font1" in [font names]}
-} {1}
+} 1
 test font-6.2 {font command: create: name specified} {
     # not (objc < 3)
     setup
     font create xyz
     expr {"xyz" in [font names]}
-} {1}
+} 1
 test font-6.3 {font command: create: name not really specified} {
     # (name[0] == '-') so name = NULL
     setup
     font create -family xyz
     expr {"font1" in [font names]}
-} {1}
+} 1
 test font-6.4 {font command: create: generate name} {
     # (name == NULL)
     setup
@@ -237,7 +237,7 @@ test font-6.4 {font command: create: generate name} {
     font delete font2
     font create -family four
     font configure font2 -family
-} {four}
+} four
 test font-6.5 {font command: create: bad option creating new font} {
     # name was specified so skip = 3
     setup
@@ -305,7 +305,7 @@ test font-7.6 {font command: delete: actually delete} {
     font create xyz -underline 1
     font delete xyz
     catch {font config xyz}
-} {1}
+} 1
 setup
 
 test font-8.1 {font command: families: arguments} {
@@ -323,7 +323,7 @@ test font-8.3 {font command: families: arguments} {
 test font-8.4 {font command: families} failsOnUbuntu {
     # TkpGetFontFamilies()
     regexp -nocase times [font families]
-} {1}
+} 1
 
 test font-9.1 {font command: measure: arguments} {
     # (skip < 0)
@@ -337,14 +337,14 @@ test font-9.3 {font command: measure: arguments} {
     # (objc - skip != 4)
     list [catch {font measure xyz abc def} msg] $msg
 } {1 {wrong # args: should be "font measure font ?-displayof window? text"}}
-test font-9.4 {font command: measure: arguments} {noExceed} {
+test font-9.4 {font command: measure: arguments} noExceed {
     # (tkfont == NULL)
     list [catch {font measure "\{xyz" abc} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
 test font-9.5 {font command: measure} failsOnUbuntu {
     # Tk_TextWidth()
     expr [font measure $fixed "abcdefg"]==[font measure $fixed "a"]*7
-} {1}
+} 1
 test font-9.6 {font command: measure -d} {
      list [catch {expr {[font measure $fixed -d] > 0}} msg] $msg
 } {0 1}
@@ -374,7 +374,7 @@ test font-10.5 {font command: metrics: arguments} {
     # (objc - skip) > 4) when skip == 2
     list [catch {font metrics xyz -displayof . abc} msg] $msg
 } {1 {bad metric "abc": must be -ascent, -descent, -linespace, or -fixed}}
-test font-10.6 {font command: metrics: bad font} {noExceed} {
+test font-10.6 {font command: metrics: bad font} noExceed {
     # (tkfont == NULL)
     list [catch {font metrics "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -395,7 +395,7 @@ test font-10.9 {font command: metrics: get individual metrics} failsOnUbuntu {
     font metrics $fixed -descent
     font metrics $fixed -linespace
     font metrics $fixed -fixed
-} {1}
+} 1
 
 test font-11.1 {font command: names: arguments} {
     # (objc != 2)
@@ -409,7 +409,7 @@ test font-11.3 {font command: names: loop test: one pass} {
     setup
     font create
     getnondefaultfonts
-} {font1}
+} font1
 test font-11.4 {font command: names: loop test: multiple passes} {
     setup
     font create xyz
@@ -447,7 +447,7 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} {
     update
     set b2 [winfo reqwidth .b.f]
     expr {$a1==$b1 && $a2==$b2}
-} {1}
+} 1
 
 test font-13.1 {CreateNamedFont: new named font} {
     # not (new == 0)
@@ -477,7 +477,7 @@ test font-13.4 {CreateNamedFont: recreate "deleted" font} {
     font delete xyz
     font create xyz -family courier
     font configure xyz -family
-} {courier}
+} courier
 
 test font-14.1 {Tk_GetFont procedure} {
 } {}
@@ -541,7 +541,7 @@ test font-15.10 {Tk_AllocFontFromObj procedure: get attribute font} {
     # (fontPtr == NULL)
     list [catch {.b.f config -font {xxx yyy zzz}} msg] $msg
 } {1 {expected integer but got "yyy"}}
-test font-15.11 {Tk_AllocFontFromObj procedure: no match} {noExceed} {
+test font-15.11 {Tk_AllocFontFromObj procedure: no match} noExceed {
     # (ParseFontNameObj() != TCL_OK)
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -608,7 +608,7 @@ test font-17.4 {Tk_FreeFont procedure: named font} {
     .b.f config -font xyz
     destroy .b.f
     expr {"xyz" in [font names]}
-} {1}
+} 1
 test font-17.5 {Tk_FreeFont procedure: named font} {
     # not (fontPtr->refCount == 0)
     setup
@@ -683,21 +683,21 @@ test font-21.1 {Tk_PostscriptFontName procedure: native} unix {
 } {AvantGarde-Book}
 test font-21.2 {Tk_PostscriptFontName procedure: native} win {
     psfontname "arial 10"
-} {Helvetica}
+} Helvetica
 test font-21.3 {Tk_PostscriptFontName procedure: native} win {
     psfontname "{times new roman} 10"
-} {Times-Roman}
+} Times-Roman
 test font-21.4 {Tk_PostscriptFontName procedure: native} win {
     psfontname "{courier new} 10"
-} {Courier}
+} Courier
 test font-21.8 {Tk_PostscriptFontName procedure: spaces} unix {
     set x [font actual {{lucida bright} 10} -family]
     if {[string match lucida*bright $x]} {
 	psfontname "{lucida bright} 10"
     } else {
-	set x {LucidaBright}
+	set x LucidaBright
     }
-} {LucidaBright}
+} LucidaBright
 test font-21.9 {Tk_PostscriptFontName procedure: spaces} {unix failsOnUbuntu} {
     psfontname "{new century schoolbook} 10"
 } {NewCenturySchlbk-Roman}
@@ -914,7 +914,7 @@ test font-27.3 {Tk_UnderlineTextLayout procedure: underline is visible} {
 test font-28.1 {Tk_PointToChar procedure: above all lines} {
     csetup "000"
     .b.c index text @-1,0
-} {0}
+} 0
 test font-28.2 {Tk_PointToChar procedure: no chars} {
     # After fixing the following bug:
     #
@@ -926,44 +926,44 @@ test font-28.2 {Tk_PointToChar procedure: no chars} {
 
     csetup ""
     .b.c index text @100,100
-} {0}
+} 0
 test font-28.3 {Tk_PointToChar procedure: loop test} {
     csetup "000\n000\n000\n000"
     .b.c index text @10000,0
-} {3}
+} 3
 test font-28.4 {Tk_PointToChar procedure: intersect line} {
     csetup "000\n000\n000"
     .b.c index text @0,$ay
-} {4}
+} 4
 test font-28.5 {Tk_PointToChar procedure: to the left of all chunks} {
     .b.c index text @-100,$ay
-} {4}
+} 4
 test font-28.6 {Tk_PointToChar procedure: past any possible chunk} {
     .b.c index text @100000,$ay
-} {7}
+} 7
 test font-28.7 {Tk_PointToChar procedure: which chunk on this line} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*2],$ay
-} {6}
+} 6
 test font-28.8 {Tk_PointToChar procedure: which chunk on this line} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*10],$ay
-} {10}
+} 10
 test font-28.9 {Tk_PointToChar procedure: in special chunk} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*6],$ay
-} {7}
+} 7
 test font-28.10 {Tk_PointToChar procedure: past all chars in chunk} {
     csetup "000 0000000"
     .b.c itemconfig text -width [expr $ax*5]
     set x [.b.c index text @[expr $ax*5],0]
     .b.c itemconfig text -width 0
     set x
-} {3}
+} 3
 test font-28.11 {Tk_PointToChar procedure: below all chunks} {
     csetup "000 0000000"
     .b.c index text @0,1000000
-} {11}
+} 11
 
 test font-29.1 {Tk_CharBBox procedure: index < 0} {
     .b.f config -text "000" -underline -1
@@ -994,14 +994,14 @@ test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x 0 -y 0
     set x
-} {0}
+} 0
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} {
     csetup "000\n000\n000"
     set x {}
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y $ay
     set x
-} {5}
+} 5
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} {
     csetup "000\n0\n000"
     set x {}
@@ -1015,7 +1015,7 @@ test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x [expr $ax*6] -y 0
     set x
-} {3}
+} 3
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} {
     csetup "000\n0\n000"
     set x {}
@@ -1053,7 +1053,7 @@ test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y 0
     set x
-} {0}
+} 0
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} {
     csetup "0\n000"
     set x {}
@@ -1074,7 +1074,7 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y $ay
     set x
-} {3}
+} 3
 .b.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} {
     csetup "000"
@@ -1082,7 +1082,7 @@ test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y 0
     set x
-} {1}
+} 1
 
 test font-31.1 {Tk_IntersectTextLayout procedure: loop once} {
     csetup "000\n000\n000"
@@ -1211,7 +1211,7 @@ test font-35.1 {GetAttributeInfoObj procedure: one attribute} {
     setup
     font create xyz -family xyz
     font config xyz -family
-} {xyz}
+} xyz
 
 test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
@@ -1268,10 +1268,10 @@ test font-38.5 {ParseFontNameObj procedure: begins with *} {
 test font-38.6 {ParseFontNameObj procedure: begins with *} {
     font actual *-times-xyz -family
 } $times
-test font-38.7 {ParseFontNameObj procedure: arguments} {noExceed} {
+test font-38.7 {ParseFontNameObj procedure: arguments} noExceed {
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
-test font-38.8 {ParseFontNameObj procedure: arguments} {noExceed} {
+test font-38.8 {ParseFontNameObj procedure: arguments} noExceed {
     list [catch {font actual ""} msg] $msg
 } {1 {font "" doesn't exist}}
 test font-38.9 {ParseFontNameObj procedure: arguments} {
@@ -1280,7 +1280,7 @@ test font-38.9 {ParseFontNameObj procedure: arguments} {
 test font-38.10 {ParseFontNameObj procedure: arguments} {
     list [catch {font actual {times xyz xyz}} msg] $msg
 } {1 {expected integer but got "xyz"}}
-test font-38.12 {ParseFontNameObj procedure: stylelist loop} {unixOrPc} {
+test font-38.12 {ParseFontNameObj procedure: stylelist loop} unixOrPc {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } {-weight bold -slant italic -underline 1 -overstrike 1}
 test font-38.13 {ParseFontNameObj procedure: stylelist error} {
@@ -1288,7 +1288,7 @@ test font-38.13 {ParseFontNameObj procedure: stylelist error} {
 } {1 {unknown font style "xyz"}}
 test font-38.14 "ParseFontNameObj: options with hyphenated family: bug #2791352" -body {
     font actual {-family sans-serif -size 12 -weight bold -slant roman -underline 0 -overstrike 0}
-} -returnCodes ok -result [font actual {sans-serif 12 bold}]
+} -result [font actual {sans-serif 12 bold}]
 test font-38.15 "ParseFontNameObj: bug #2791352" -body {
     font actual {-invalidfont 8 bold}
 } -returnCodes error -match glob -result {bad option "-invalidfont": *}
@@ -1350,10 +1350,10 @@ set oldscale [tk scaling]
 tk scaling 0.5
 test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
-} {24}
-test font-44.2 {TkFontGetPoints: size >= 0} {noExceed} {
+} 24
+test font-44.2 {TkFontGetPoints: size >= 0} noExceed {
     font actual {times 12} -size
-} {12}
+} 12
 
 tk scaling $oldscale
 
diff --git a/tests/safe.test b/tests/safe.test
index d5488dc..914adaa 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1,5 +1,5 @@
-# This file is a Tcl script to test the Safe Tk facility. It is organized
-# in the standard fashion for Tk tests.
+# This file is a Tcl script to test the Safe Tk facility. It is organized in
+# the standard fashion for Tk tests.
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1995 Sun Microsystems, Inc.
@@ -9,6 +9,7 @@
 package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+namespace import -force tcltest::test
 
 ## NOTE: Any time tests fail here with an error like:
 
@@ -27,181 +28,200 @@ tcltest::loadTestedCommands
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
-## Ensure that any changes that occured to tk.tcl will work or
-## are properly prevented in a safe interpreter.  -- hobbs
+## Ensure that any changes that occurred to tk.tcl will work or are properly
+## prevented in a safe interpreter.  -- hobbs
 
 set saveAutoPath $::auto_path
 set auto_path [list [info library] $::tk_library]
 
-test safe-1.1 {Safe Tk loading into an interpreter} {
+test safe-1.1 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::loadTk [safe::interpCreate a]
     safe::interpDelete a
     set x {}
     set x
-} ""
-test safe-1.2 {Safe Tk loading into an interpreter} -body {
+} -result {}
+test safe-1.2 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
-    set l [lsort [interp hidden a]]
+    lsort [interp hidden a]
+} -cleanup {
     safe::interpDelete a
-    set l
 } -match glob -result {bell cd clipboard encoding exec exit fconfigure*glob grab load menu open pwd selection send socket source*toplevel unload wm}
-test safe-1.3 {Safe Tk loading into an interpreter} -body {
+test safe-1.3 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
-    set l [lsort [interp aliases a]]
+    lsort [interp aliases a]
+} -cleanup {
     safe::interpDelete a
-    set l
 } -match glob -result {*encoding*exit*load*source*}
 
-test safe-2.1 {Unsafe commands not available} {
+test safe-2.1 {Unsafe commands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {toplevel .t}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-2.2 {Unsafe commands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-2.2 {Unsafe commands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {menu .m}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-2.3 {Unsafe subcommands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-2.3 {Unsafe subcommands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {tk appname}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     list $status $msg
-} {ok {appname not accessible in a safe interpreter}}
-test safe-2.4 {Unsafe subcommands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result {ok {appname not accessible in a safe interpreter}}
+test safe-2.4 {Unsafe subcommands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {tk scaling}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     list $status $msg
-} {ok {scaling not accessible in a safe interpreter}}
+} -cleanup {
+    safe::interpDelete a
+} -result {ok {scaling not accessible in a safe interpreter}}
 
-test safe-3.1 {Unsafe commands are available hidden} {
+test safe-3.1 {Unsafe commands are available hidden} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status ok
     if {[catch {interp invokehidden a toplevel .t} msg]} {
 	set status broken
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-3.2 {Unsafe commands are available hidden} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-3.2 {Unsafe commands are available hidden} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status ok
     if {[catch {interp invokehidden a menu .m} msg]} {
 	set status broken
     }
-    safe::interpDelete a
     set status
-} ok
+} -cleanup {
+    safe::interpDelete a
+} -result ok
 
-test safe-4.1 {testing loadTk} {
-    # no error shall occur, the user will
-    # eventually see a new toplevel
+test safe-4.1 {testing loadTk} -body {
+    # no error shall occur, the user will eventually see a new toplevel
     set i [safe::loadTk [safe::interpCreate]]
     interp eval $i {button .b -text "hello world!"; pack .b}
-    # lets don't update because it might imply that the user has
-    # to position the window (if the wm does not do it automatically)
-    # and thus make the test suite not runable non interactively
+    # lets don't update because it might imply that the user has to position
+    # the window (if the wm does not do it automatically) and thus make the
+    # test suite not runable non interactively
     safe::interpDelete $i
-} {}
-
-test safe-4.2 {testing loadTk -use} {
+} -result {}
+test safe-4.2 {testing loadTk -use} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i [safe::loadTk [safe::interpCreate] -use [winfo id $w]]
     interp eval $i {button .b -text "hello world!"; pack .b}
     safe::interpDelete $i
     destroy $w
-} {}
+} -result {}
 
-test safe-5.1 {loading Tk in safe interps without master's clearance} {
+test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
     set i [safe::interpCreate]
-    catch {interp eval $i {load {} Tk}} msg
+    interp eval $i {load {} Tk}
+} -cleanup {
     safe::interpDelete $i
-    set msg
-} {not allowed to start Tk by master's safe::TkInit}
-
-test safe-5.2 {multi-level Tk loading with clearance} {
-    # No error shall occur in that test and no window
-    # shall remain at the end.
-    set i [safe::interpCreate]
-    set j [list $i x]
-    set j [safe::interpCreate $j]
-    safe::loadTk $j
-    interp eval $j {
+} -returnCodes error -match glob -result {*not allowed*}
+test safe-5.2 {multi-level Tk loading with clearance} -setup {
+    set safeParent [safe::interpCreate]
+} -body {
+    # No error shall occur in that test and no window shall remain at the end.
+    set i [safe::interpCreate [list $safeParent x]]
+    safe::loadTk $i
+    interp eval $i {
 	button .b -text Ok -command {destroy .}
 	pack .b
 #	tkwait window . ; # for interactive testing/debugging
     }
-    safe::interpDelete $j
-    safe::interpDelete $i
-} {}
-
-test safe-6.1 {loadTk -use windowPath} {
+} -cleanup {
+    catch {safe::interpDelete $i}
+    safe::interpDelete $safeParent
+} -result {}
+
+test safe-6.1 {loadTk -use windowPath} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i [safe::loadTk [safe::interpCreate] -use $w]
     interp eval $i {button .b -text "hello world!"; pack .b}
     safe::interpDelete $i
     destroy $w
-} {}
-
-test safe-6.2 {loadTk -use windowPath, conflicting -display} {
+} -result {}
+test safe-6.2 {loadTk -use windowPath, conflicting -display} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i     [safe::interpCreate]
     catch {safe::loadTk $i -use $w -display :23.56} msg
+    string range $msg 0 36
+} -cleanup {
     safe::interpDelete $i
     destroy $w
-    string range $msg 0 36
-} {conflicting -display :23.56 and -use }
-
+} -result {conflicting -display :23.56 and -use }
 
-test safe-7.1 {canvas printing} {
+test safe-7.1 {canvas printing} -body {
     set i [safe::loadTk [safe::interpCreate]]
-    set r [catch {interp eval $i {canvas .c; .c postscript}}]
+    interp eval $i {canvas .c; .c postscript}
+} -cleanup {
     safe::interpDelete $i
-    set r
-} 0
-
+} -match glob -result *
+
 # cleanup
 set ::auto_path $saveAutoPath
 cleanupTests
 return
+
+# Local Variables:
+# mode: tcl
+# fill-column: 78
+# End:
diff --git a/tests/tk.test b/tests/tk.test
index 9673caa..76455d7 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -8,132 +8,144 @@
 package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+namespace import -force tcltest::test
 
-test tk-1.1 {tk command: general} \
-    -body {tk} -returnCodes 1 \
-    -result {wrong # args: should be "tk option ?arg?"}
-test tk-1.2 {tk command: general} \
-    -body {tk xyz} -returnCodes 1 \
-    -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
+test tk-1.1 {tk command: general} -body {
+    tk
+} -returnCodes 1 -result {wrong # args: should be "tk option ?arg?"}
+test tk-1.2 {tk command: general} -body {
+    tk xyz
+} -returnCodes 1 -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
 
+# Value stored to restore default settings after 2.* tests
 set appname [tk appname]
-test tk-2.1 {tk command: appname} {
-    list [catch {tk appname xyz abc} msg] $msg
-} {1 {wrong # args: should be "tk appname ?newName?"}}
-test tk-2.2 {tk command: appname} {
+test tk-2.1 {tk command: appname} -body {
+    tk appname xyz abc
+} -returnCodes 1 -result {wrong # args: should be "tk appname ?newName?"}
+test tk-2.2 {tk command: appname} -body {
     tk appname foobazgarply
-} {foobazgarply}
-test tk-2.3 {tk command: appname} unix {
+} -result foobazgarply
+test tk-2.3 {tk command: appname} -constraints unix -body {
     tk appname bazfoogarply
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} {1}
-test tk-2.4 {tk command: appname} {
+} -result 1
+test tk-2.4 {tk command: appname} -body {
     tk appname $appname
-} $appname
+} -result $appname
 tk appname $appname
 
+# Value stored to restore default settings after 3.* tests
 set scaling [tk scaling]
-test tk-3.1 {tk command: scaling} {
-    list [catch {tk scaling -displayof} msg] $msg
-} {1 {value for "-displayof" missing}}
-test tk-3.2 {tk command: scaling: get current} {
+test tk-3.1 {tk command: scaling} -body {
+    tk scaling -displayof
+} -returnCodes 1 -result {value for "-displayof" missing}
+test tk-3.2 {tk command: scaling: get current} -body {
     tk scaling 1
     format %.2g [tk scaling]
-} 1
-test tk-3.3 {tk command: scaling: get current} {
+} -result 1
+test tk-3.3 {tk command: scaling: get current} -body {
     tk scaling -displayof . 1.25
     format %.3g [tk scaling]
-} 1.25
-test tk-3.4 {tk command: scaling: set new} {
-    list [catch {tk scaling xyz} msg] $msg
-} {1 {expected floating-point number but got "xyz"}}
-test tk-3.5 {tk command: scaling: set new} {
-    list [catch {tk scaling -displayof . xyz} msg] $msg
-} {1 {expected floating-point number but got "xyz"}}
-test tk-3.6 {tk command: scaling: set new} {
+} -result 1.25
+test tk-3.4 {tk command: scaling: set new} -body {
+    tk scaling xyz
+} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+test tk-3.5 {tk command: scaling: set new} -body {
+    tk scaling -displayof . xyz
+} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+test tk-3.6 {tk command: scaling: set new} -body {
     tk scaling 1
     format %.2g [tk scaling]
-} 1
-test tk-3.7 {tk command: scaling: set new} {
+} -result 1
+test tk-3.7 {tk command: scaling: set new} -body {
     tk scaling -displayof . 1.25
     format %.3g [tk scaling]
-} 1.25
-test tk-3.8 {tk command: scaling: negative} {
+} -result 1.25
+test tk-3.8 {tk command: scaling: negative} -body {
     tk scaling -1
     expr {[tk scaling] > 0}
-} {1}
-test tk-3.9 {tk command: scaling: too big} {
+} -result 1
+test tk-3.9 {tk command: scaling: too big} -body {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} 1
-test tk-3.10 {tk command: scaling: widthmm} {
+} -result 1
+test tk-3.10 {tk command: scaling: widthmm} -body {
     tk scaling 1.25
-    expr {int((25.4*[winfo screenwidth .])/(72*1.25)+0.5)-[winfo screenmmwidth .]}
-} {0}
-test tk-3.11 {tk command: scaling: heightmm} {
+    expr {int((25.4*[winfo screenwidth .])/(72*1.25) + 0.5) \
+        - [winfo screenmmwidth .]}
+} -result 0
+test tk-3.11 {tk command: scaling: heightmm} -body {
     tk scaling 1.25
-    expr {int((25.4*[winfo screenheight .])/(72*1.25)+0.5)-[winfo screenmmheight .]}
-} {0}
+    expr {int((25.4*[winfo screenheight .])/(72*1.25) + 0.5) \
+        - [winfo screenmmheight .]}
+} -result 0
 tk scaling $scaling
 
+# Value stored to restore default settings after 4.* tests
 set useim [tk useinputmethods]
-test tk-4.1 {tk command: useinputmethods} {
-    list [catch {tk useinputmethods -displayof} msg] $msg
-} {1 {value for "-displayof" missing}}
-test tk-4.2 {tk command: useinputmethods: get current} {
+test tk-4.1 {tk command: useinputmethods} -body {
+    tk useinputmethods -displayof
+} -returnCodes 1 -result {value for "-displayof" missing}
+test tk-4.2 {tk command: useinputmethods: get current} -body {
+    tk useinputmethods no
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
+test tk-4.3 {tk command: useinputmethods: get current} -body {
     tk useinputmethods no
-} 0
-test tk-4.3 {tk command: useinputmethods: get current} {
     tk useinputmethods -displayof .
-} 0
-test tk-4.4 {tk command: useinputmethods: set new} {
-    list [catch {tk useinputmethods xyz} msg] $msg
-} {1 {expected boolean value but got "xyz"}}
-test tk-4.5 {tk command: useinputmethods: set new} {
-    list [catch {tk useinputmethods -displayof . xyz} msg] $msg
-} {1 {expected boolean value but got "xyz"}}
-test tk-4.6 {tk command: useinputmethods: set new} unix {
-    # This isn't really a test, but more of a check...
-    # The answer is what was given, because we may be on a Unix
-    # system that doesn't have the XIM stuff
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
+test tk-4.4 {tk command: useinputmethods: set new} -body {
+    tk useinputmethods xyz
+} -returnCodes 1 -result {expected boolean value but got "xyz"}
+test tk-4.5 {tk command: useinputmethods: set new} -body {
+    tk useinputmethods -displayof . xyz
+} -returnCodes 1 -result {expected boolean value but got "xyz"}
+test tk-4.6 {tk command: useinputmethods: set new} -constraints unix -body {
+    # This isn't really a test, but more of a check... The answer is what was
+    # given, because we may be on a Unix system that doesn't have the XIM
+    # stuff
     if {[tk useinputmethods 1] == 0} {
 	puts "this wish doesn't have XIM (X Input Methods) support"
     }
     set useim
-} $useim
-test tk-4.7 {tk command: useinputmethods: set new} win {
-    # Mac and Windows don't have X Input Methods, so this should
-    # always return 0
+} -result $useim
+test tk-4.7 {tk command: useinputmethods: set new} -constraints win -body {
+    # Mac and Windows don't have X Input Methods, so this should always return
+    # 0
     tk useinputmethods 1
-} 0
-tk useinputmethods $useim
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
 
-test tk-5.1 {tk caret} {
-    list [catch {tk caret} msg] $msg
-} {1 {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}}
-test tk-5.2 {tk caret} {
-    list [catch {tk caret bogus} msg] $msg
-} {1 {bad window path name "bogus"}}
-test tk-5.3 {tk caret} {
-    list [catch {tk caret . -foo} msg] $msg
-} {1 {bad caret option "-foo": must be -x, -y, or -height}}
-test tk-5.4 {tk caret} {
-    list [catch {tk caret . -x 0 -y} msg] $msg
-} {1 {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}}
-test tk-5.5 {tk caret} {
-    list [catch {tk caret . -x 10 -y 11 -h 12; tk caret .} msg] $msg
-} {0 {-height 12 -x 10 -y 11}}
-test tk-5.6 {tk caret} {
-    list [catch {tk caret . -x 20 -y 25 -h 30; tk caret . -hei} msg] $msg
-} {0 30}
+test tk-5.1 {tk caret} -body {
+    tk caret
+} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+test tk-5.2 {tk caret} -body {
+    tk caret bogus
+} -returnCodes 1 -result {bad window path name "bogus"}
+test tk-5.3 {tk caret} -body {
+    tk caret . -foo
+} -returnCodes 1 -result {bad caret option "-foo": must be -x, -y, or -height}
+test tk-5.4 {tk caret} -body {
+    tk caret . -x 0 -y
+} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+test tk-5.5 {tk caret} -body {
+    tk caret . -x 10 -y 11 -h 12; tk caret .
+} -result {-height 12 -x 10 -y 11}
+test tk-5.6 {tk caret} -body {
+    tk caret . -x 20 -y 25 -h 30; tk caret . -hei
+} -result 30
 
 # tk inactive
 test tk-6.1 {tk inactive} -body {
     string is integer [tk inactive]
 } -result 1
 test tk-6.2 {tk inactive reset} -body {
-    catch {tk inactive reset}
-} -result 0
+    tk inactive reset
+} -match glob -result *
 test tk-6.3 {tk inactive wrong argument} -body {
     tk inactive foo
 } -returnCodes 1 -result {bad option "foo": must be reset}
@@ -145,19 +157,25 @@ test tk-6.5 {tk inactive} -body {
     update
     after 100
     set i [tk inactive]
-    expr {$i == -1 || ( $i > 90 && $i < 200 )}
+    expr {$i < 0 || ( $i > 90 && $i < 200 )}
 } -result 1
 
-# tk inactive in safe interpreters
-safe::interpCreate foo
-safe::loadTk foo
 test tk-7.1 {tk inactive in a safe interpreter} -body {
+# tk inactive in safe interpreters
+    safe::interpCreate foo
+    safe::loadTk foo
     foo eval {tk inactive}
+} -cleanup {
+    ::safe::interpDelete foo
 } -result -1
 test tk-7.2 {tk inactive reset in a safe interpreter} -body {
+# tk inactive in safe interpreters
+    safe::interpCreate foo
+    safe::loadTk foo
     foo eval {tk inactive reset}
+} -cleanup {
+    ::safe::interpDelete foo
 } -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
-::safe::interpDelete foo
 
 # cleanup
 cleanupTests
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 7c427ec..e292d38 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -632,7 +632,7 @@ test unixWm-17.2 {Tk_WmCmd procedure, "focusmodel" option} unix {
     list [catch {wm focusmodel .t bogus} msg] $msg
 } {1 {bad argument "bogus": must be active or passive}}
 test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} unix {
-    set result {} 
+    set result {}
     lappend result [wm focusmodel .t]
     wm focusmodel .t active
     lappend result [wm focusmodel .t]
@@ -1328,7 +1328,7 @@ test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on gr
     destroy .t
     toplevel .t
     wm geometry .t 30x10+0+0
-    listbox .t.l -height 20 -width 20 -setgrid 1 
+    listbox .t.l -height 20 -width 20 -setgrid 1
     pack .t.l -fill both -expand 1
     update
     wm geometry .t
@@ -1337,7 +1337,7 @@ test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already
     destroy .t
     toplevel .t
     wm geometry .t 200x100+0+0
-    listbox .t.l -height 20 -width 20 
+    listbox .t.l -height 20 -width 20
     pack .t.l -fill both -expand 1
     update
     .t.l configure -setgrid 1
@@ -1750,7 +1750,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
     testmenubar window .t .t.m
     update
     list [expr [winfo rootx .t.m.f] - $x] [expr [winfo rooty .t.m.f] - $y] \
-	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y] 
+	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y]
 } {52 7 12 62}
 
 deleteWindows
diff --git a/tests/winFont.test b/tests/winFont.test
index b4e8516..de16560 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -1,10 +1,10 @@
-# This file is a Tcl script to test out the procedures in tkWinFont.c. 
+# This file is a Tcl script to test out the procedures in tkWinFont.c.
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
 # programmatically (such as "does an underlined font appear to be
 # underlined?"); these tests attempt to exercise the code in question,
-# but there are no results that can be checked.  
+# but there are no results that can be checked.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
@@ -54,22 +54,22 @@ test winfont-1.2 {TkpGetNativeFont procedure: native} win {
 
 test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} win {
     expr [font actual {-size -10} -size]>0
-} {1}
+} 1
 test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} win {
     expr [font actual {-family Arial} -size]>0
-} {1}
+} 1
 test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} win {
     font actual {-weight normal} -weight
-} {normal}
+} normal
 test winfont-2.4 {TkpGetFontFromAttributes procedure: bold weight} win {
     font actual {-weight bold} -weight
-} {bold}
+} bold
 test winfont-2.5 {TkpGetFontFromAttributes procedure: no family} win {
     catch {expr {[font actual {-size 10} -size]}}
 } 0
 test winfont-2.6 {TkpGetFontFromAttributes procedure: family} win {
     font actual {-family Arial} -family
-} {Arial}
+} Arial
 test winfont-2.7 {TkpGetFontFromAttributes procedure: Times fonts} win {
     set x {}
     lappend x [font actual {-family "Times"} -family]
@@ -122,7 +122,7 @@ test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} win {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($cx*2.5)],1
-} {2}
+} 2
 test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} win {
     .b.l config -text "000000" -wrap 1
     getsize
@@ -173,10 +173,10 @@ test winfont-7.2 {AllocFont procedure: extract info from logfont} win {
 } {-family Arial -size 10 -weight bold -slant italic -underline 1 -overstrike 1}
 test winfont-7.3 {AllocFont procedure: extract info from textmetric} win {
     font metric {arial 10 bold italic underline overstrike} -fixed
-} {0}
+} 0
 test winfont-7.4 {AllocFont procedure: extract info from textmetric} win {
     font metric systemfixed -fixed
-} {1}
+} 1
 
 # cleanup
 destroy .b
diff --git a/tests/winMenu.test b/tests/winMenu.test
index d3114bd..5b98c3b 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -579,7 +579,7 @@ test winMenu-22.1 {DrawMenuUnderline} win {
     .m1 add command -label foo -underline 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
-} {{} {}}   
+} {{} {}}
 
 test winMenu-23.1 {Don't know how to test MenuKeyBindProc} \
 	{win emptyTest} {} {}
@@ -997,7 +997,7 @@ test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} win {
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]    
+    list [update idletasks] [destroy .m1]
 } {{} {}}
 
 test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} win {
diff --git a/tests/winWm.test b/tests/winWm.test
index 838af04..d195771 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -106,7 +106,7 @@ test winWm-2.2 {TkpWmSetState} win {
     update
     lappend result [wm state .t]
     wm deiconify .t
-    update 
+    update
     lappend result [wm state .t]
     destroy .t
     set result
@@ -123,7 +123,7 @@ test winWm-2.3 {TkpWmSetState} win {
     update
     lappend result [wm state .t]
     wm state .t normal
-    update 
+    update
     lappend result [wm state .t]
     destroy .t
     set result
@@ -205,7 +205,7 @@ test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
     update
     lappend result [winfo height .t]
     destroy .t
-    
+
     set result
 } {50 50 31}
 test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
@@ -238,7 +238,7 @@ test winWm-6.2 {wm attributes} win {
     destroy .t
     toplevel .t
     wm attributes .t -disabled
-} {0}
+} 0
 test winWm-6.3 {wm attributes} win {
     # This isn't quite the correct error message yet, but it works.
     destroy .t
@@ -400,7 +400,7 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
     global winwm90done
     set winwm90done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm90proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     after 5000 {set winwm90done timeout}
@@ -411,7 +411,7 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
         rename winwm90$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
 test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win -setup {
     proc winwm91click {w} {
@@ -445,7 +445,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
     global winwm91done
     set winwm91done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm91proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm91click %W}}
     after 5000 {set winwm91done timeout}
@@ -456,7 +456,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
         rename winwm91$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
 test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
     destroy .t
-- 
cgit v0.12


From e93e116ad2aa508b450befa54af69522cc9d57ac Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Sep 2020 15:03:57 +0000
Subject: Compile with gcc-10 too. Mark more test-cases as failing on Ubuntu

---
 .travis.yml                |  38 ++++------
 tests/bugs.tcl             |   2 +-
 tests/butGeom2.tcl         |   2 +-
 tests/canvPsGrph.tcl       |   6 +-
 tests/canvPsImg.tcl        |   2 +-
 tests/canvText.test        |   2 +-
 tests/imgPhoto.test        |   2 +-
 tests/option.file1         |   2 +-
 tests/scrollbar.test       |   4 +-
 tests/send.test            |   3 +-
 tests/textDisp.test        |   4 +-
 tests/tk.test              |  32 ++++-----
 tests/ttk/combobox.test    |   2 +-
 tests/ttk/image.test       |   2 +-
 tests/ttk/labelframe.test  |   8 +--
 tests/ttk/notebook.test    |   4 +-
 tests/ttk/panedwindow.test |   8 +--
 tests/ttk/progressbar.test |   2 +-
 tests/ttk/scrollbar.test   |   2 +-
 tests/ttk/treetags.test    |   2 +-
 tests/ttk/treeview.test    |  34 ++++-----
 tests/ttk/ttk.test         |  36 +++++-----
 tests/unixWm.test          |   2 +-
 tests/winWm.test           | 173 +++++++++++++++++++++++++++++----------------
 24 files changed, 205 insertions(+), 169 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a63e50..417c652 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: c
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - binutils-mingw-w64-i686
       - binutils-mingw-w64-x86-64
@@ -19,7 +21,7 @@ addons:
       - xquartz
 jobs:
   include:
-# Testing on Linux with various compilers
+# Testing on Linux GCC
     - name: "Linux/GCC/Shared"
       os: linux
       dist: focal
@@ -31,12 +33,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-ttk >out-ttk.txt
-        - cat out-ttk.txt
-        - grep -q "Failed\t0" out-ttk.txt
         - make test-classic >out-classic.txt
         - cat out-classic.txt
         - grep -q "Failed\t0" out-classic.txt
+        - make test-ttk >out-ttk.txt
+        - cat out-ttk.txt
+        - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
@@ -79,29 +81,15 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
-# Older versions of GCC...
-    - name: "Linux/GCC 7/Shared"
+# Newer/Older versions of GCC
+    - name: "Linux/GCC 10/Shared"
       os: linux
       dist: focal
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC 6/Shared"
-      os: linux
-      dist: bionic
-      compiler: gcc-6
+      compiler: gcc-10
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
-            - g++-6
+            - g++-10
       env:
         - BUILD_DIR=unix
     - name: "Linux/GCC 5/Shared"
@@ -110,13 +98,11 @@ jobs:
       compiler: gcc-5
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
         - BUILD_DIR=unix
-# Clang
+# Testing on Linux Clang
     - name: "Linux/Clang/Shared"
       os: linux
       dist: focal
@@ -145,7 +131,7 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Clang/Xcode 11.7/Shared/XQuartz"
+    - name: "macOS/Xcode 11.7/Shared/XQuartz"
       os: osx
       osx_image: xcode11.7
       env:
diff --git a/tests/bugs.tcl b/tests/bugs.tcl
index 83d9519..55e5f84 100644
--- a/tests/bugs.tcl
+++ b/tests/bugs.tcl
@@ -1,6 +1,6 @@
 # This file is a Tcl script to test out various known bugs that will
 # cause Tk to crash.  This file ends with .tcl instead of .test to make
-# sure it isn't run when you type "source all".  We currently are not 
+# sure it isn't run when you type "source all".  We currently are not
 # shipping this file with the rest of the source release.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
diff --git a/tests/butGeom2.tcl b/tests/butGeom2.tcl
index 96ff209..096225c 100644
--- a/tests/butGeom2.tcl
+++ b/tests/butGeom2.tcl
@@ -35,7 +35,7 @@ pack .t.anchorLabel .t.control.left.f -in .t.control.left -side top -anchor w
 foreach opt {activebackground activeforeground background disabledforeground foreground highlightbackground highlightcolor } {
     #button .t.color-$opt -text $opt -command "config -$opt \[tk_chooseColor]"
     menubutton .t.color-$opt -text $opt -menu .t.color-$opt.m -indicatoron 1 \
-        -relief raised -bd 2 
+        -relief raised -bd 2
     menu .t.color-$opt.m -tearoff 0
     .t.color-$opt.m add command -label Red -command "config -$opt red"
     .t.color-$opt.m add command -label Green -command "config -$opt green"
diff --git a/tests/canvPsGrph.tcl b/tests/canvPsGrph.tcl
index 343979f..08ccd74 100644
--- a/tests/canvPsGrph.tcl
+++ b/tests/canvPsGrph.tcl
@@ -50,13 +50,13 @@ proc mkObjs c {
 	$c create rect 380 200 420 240 -fill black
 	$c create rect 200 330 240 370 -fill black
     }
-    
+
     if {$what == "oval"} {
 	$c create oval 50 10 150 80 -fill black -stipple gray25 -outline {}
 	$c create oval 100 100 200 150 -outline {} -fill black -stipple gray50
 	$c create oval 250 100 400 300 -width .5c
     }
-    
+
     if {$what == "poly"} {
 	$c create poly 100 200 200 50 300 200 -smooth yes -stipple gray25 \
 		-outline black -width 4
@@ -68,7 +68,7 @@ proc mkObjs c {
 	$c create poly 20 200 100 220 90 100 40 250 \
 		-fill {} -outline brown -width 3
     }
-    
+
     if {$what == "line"} {
 	$c create line 20 20 120 20 -arrow both -width 5
 	$c create line 20 80 150 80 20 200 150 200 -smooth yes
diff --git a/tests/canvPsImg.tcl b/tests/canvPsImg.tcl
index c06aeaa..1f46eca 100644
--- a/tests/canvPsImg.tcl
+++ b/tests/canvPsImg.tcl
@@ -35,7 +35,7 @@ toplevel .t
 wm title .t "Postscript Tests for Canvases: Images"
 wm iconname .t "Postscript"
 
-message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images.  Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output.  Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps".  You can also click on items in the canvas to delete them.  
+message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images.  Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output.  Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps".  You can also click on items in the canvas to delete them.
 NOTE: Some Postscript printers may not be able to handle Postscript generated in color mode.} -width 6i
 pack .t.m -side top -fill both
 
diff --git a/tests/canvText.test b/tests/canvText.test
index f79e6df..77eb735 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -478,7 +478,7 @@ set font {Courier 12 italic}
 set ax [font measure $font 0]
 set ay [font metrics $font -linespace]
 
-test canvText-17.1 {TextToPostscript procedure} {
+test canvText-17.1 {TextToPostscript procedure} failsOnUbuntu {
     .c delete all
     .c config -height 300 -highlightthickness 0 -bd 0
     update
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index eda0c13..bd3e8ca 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -454,7 +454,7 @@ test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
     photo1 put {{white}} -to 10 10 20 20 {{white}}
 } -cleanup {
     image delete photo1
-} -returnCodes 1 -result {wrong # args: should be "photo1 put data ?options?"}
+} -returnCodes error -result {wrong # args: should be "photo1 put data ?options?"}
 test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
     hasTeapotPhoto
 } -body {
diff --git a/tests/option.file1 b/tests/option.file1
index 32b4a18..c5a216e 100644
--- a/tests/option.file1
+++ b/tests/option.file1
@@ -13,6 +13,6 @@ ple
 *x 4:	brown
 # More comments, this time delimited by hash-marks.
 	# Comment-line with space.
-*x6:	  
+*x6:
 *x9: \ \	\\\101\n
 # comment line as last line of file.
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 8b631fa..e69e1d2 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -565,10 +565,10 @@ test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s] \
 		       - 1] [expr [winfo height .t.s] / 2]
 } {slider}
-test scrollbar-6.44 {ScrollbarPosition procedure} unix {
+test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .t.s identify 100 18
 } {trough2}
-test scrollbar-6.46 {ScrollbarPosition procedure} win {
+test scrollbar-6.45 {ScrollbarPosition procedure} win {
     .t.s identify 100 [expr [winfo height .t.s] - 1]
 } {trough2}
 
diff --git a/tests/send.test b/tests/send.test
index b4ed50b..16d4202 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -15,6 +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)]}]
 
 # Compute a script that will load Tk into a child interpreter.
 
@@ -284,7 +285,7 @@ test send-8.14 {Tk_SendCmd procedure, local interp killed by send} {secureserver
 
 catch {interp delete t_s_2}
 
-test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend} {
+test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend failsOnUbuntu} {
     catch {error foo}
     list [catch {send t_s_1 {if 1 {open bogus_file_name}}} msg] $msg $errorInfo $errorCode
 } {1 {couldn't open "bogus_file_name": no such file or directory} {couldn't open "bogus_file_name": no such file or directory
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 8d130ae..2be64ce 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -2808,7 +2808,7 @@ test textDisp-19.16 {count -ypixels} {
       [.t count -ypixels 16.0 "16.0 displaylineend +1c"] \
       [.t count -ypixels "16.0 +1 displaylines" "16.0 +4 displaylines +3c"]
 } [list [expr {260 + 20 * $fixedDiff}] [expr {260 + 20 * $fixedDiff}] $fixedHeight [expr {2*$fixedHeight}] $fixedHeight [expr {3*$fixedHeight}]]
-test textDisp-19.17 {count -ypixels with indices in elided lines} {
+test textDisp-19.17 {count -ypixels with indices in elided lines} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
@@ -2835,7 +2835,7 @@ test textDisp-19.17 {count -ypixels with indices in elided lines} {
     .t yview 35.0
     lappend res [.t count -ypixels 5.0 25.0]
 } [list [expr {4 * $fixedHeight}] [expr {3 * $fixedHeight}] 0 0 0 0 0 0 [expr {5 * $fixedHeight}] [expr {- 5 * $fixedHeight}] [expr {2 * $fixedHeight}] [expr {3 * $fixedHeight}] [expr {5 * $fixedHeight}]]
-test textDisp-19.18 {count -ypixels with indices in elided lines} {
+test textDisp-19.18 {count -ypixels with indices in elided lines} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
diff --git a/tests/tk.test b/tests/tk.test
index 76455d7..48f3d46 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -12,16 +12,16 @@ namespace import -force tcltest::test
 
 test tk-1.1 {tk command: general} -body {
     tk
-} -returnCodes 1 -result {wrong # args: should be "tk option ?arg?"}
+} -returnCodes error -result {wrong # args: should be "tk option ?arg?"}
 test tk-1.2 {tk command: general} -body {
     tk xyz
-} -returnCodes 1 -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
+} -returnCodes error -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
 
 # Value stored to restore default settings after 2.* tests
 set appname [tk appname]
 test tk-2.1 {tk command: appname} -body {
     tk appname xyz abc
-} -returnCodes 1 -result {wrong # args: should be "tk appname ?newName?"}
+} -returnCodes error -result {wrong # args: should be "tk appname ?newName?"}
 test tk-2.2 {tk command: appname} -body {
     tk appname foobazgarply
 } -result foobazgarply
@@ -38,7 +38,7 @@ tk appname $appname
 set scaling [tk scaling]
 test tk-3.1 {tk command: scaling} -body {
     tk scaling -displayof
-} -returnCodes 1 -result {value for "-displayof" missing}
+} -returnCodes error -result {value for "-displayof" missing}
 test tk-3.2 {tk command: scaling: get current} -body {
     tk scaling 1
     format %.2g [tk scaling]
@@ -49,10 +49,10 @@ test tk-3.3 {tk command: scaling: get current} -body {
 } -result 1.25
 test tk-3.4 {tk command: scaling: set new} -body {
     tk scaling xyz
-} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+} -returnCodes error -result {expected floating-point number but got "xyz"}
 test tk-3.5 {tk command: scaling: set new} -body {
     tk scaling -displayof . xyz
-} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+} -returnCodes error -result {expected floating-point number but got "xyz"}
 test tk-3.6 {tk command: scaling: set new} -body {
     tk scaling 1
     format %.2g [tk scaling]
@@ -85,7 +85,7 @@ tk scaling $scaling
 set useim [tk useinputmethods]
 test tk-4.1 {tk command: useinputmethods} -body {
     tk useinputmethods -displayof
-} -returnCodes 1 -result {value for "-displayof" missing}
+} -returnCodes error -result {value for "-displayof" missing}
 test tk-4.2 {tk command: useinputmethods: get current} -body {
     tk useinputmethods no
 } -cleanup {
@@ -99,10 +99,10 @@ test tk-4.3 {tk command: useinputmethods: get current} -body {
 } -result 0
 test tk-4.4 {tk command: useinputmethods: set new} -body {
     tk useinputmethods xyz
-} -returnCodes 1 -result {expected boolean value but got "xyz"}
+} -returnCodes error -result {expected boolean value but got "xyz"}
 test tk-4.5 {tk command: useinputmethods: set new} -body {
     tk useinputmethods -displayof . xyz
-} -returnCodes 1 -result {expected boolean value but got "xyz"}
+} -returnCodes error -result {expected boolean value but got "xyz"}
 test tk-4.6 {tk command: useinputmethods: set new} -constraints unix -body {
     # This isn't really a test, but more of a check... The answer is what was
     # given, because we may be on a Unix system that doesn't have the XIM
@@ -122,16 +122,16 @@ test tk-4.7 {tk command: useinputmethods: set new} -constraints win -body {
 
 test tk-5.1 {tk caret} -body {
     tk caret
-} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+} -returnCodes error -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
 test tk-5.2 {tk caret} -body {
     tk caret bogus
-} -returnCodes 1 -result {bad window path name "bogus"}
+} -returnCodes error -result {bad window path name "bogus"}
 test tk-5.3 {tk caret} -body {
     tk caret . -foo
-} -returnCodes 1 -result {bad caret option "-foo": must be -x, -y, or -height}
+} -returnCodes error -result {bad caret option "-foo": must be -x, -y, or -height}
 test tk-5.4 {tk caret} -body {
     tk caret . -x 0 -y
-} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+} -returnCodes error -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
 test tk-5.5 {tk caret} -body {
     tk caret . -x 10 -y 11 -h 12; tk caret .
 } -result {-height 12 -x 10 -y 11}
@@ -148,10 +148,10 @@ test tk-6.2 {tk inactive reset} -body {
 } -match glob -result *
 test tk-6.3 {tk inactive wrong argument} -body {
     tk inactive foo
-} -returnCodes 1 -result {bad option "foo": must be reset}
+} -returnCodes error -result {bad option "foo": must be reset}
 test tk-6.4 {tk inactive too many arguments} -body {
     tk inactive reset foo
-} -returnCodes 1 -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"}
+} -returnCodes error -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"}
 test tk-6.5 {tk inactive} -body {
     tk inactive reset
     update
@@ -175,7 +175,7 @@ test tk-7.2 {tk inactive reset in a safe interpreter} -body {
     foo eval {tk inactive reset}
 } -cleanup {
     ::safe::interpDelete foo
-} -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
+} -returnCodes error -result {resetting the user inactivity timer is not allowed in a safe interpreter}
 
 # cleanup
 cleanupTests
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 577d449..e3e4373 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -13,7 +13,7 @@ test combobox-1.0 "Combobox tests -- setup" -body {
 
 test combobox-1.1 "Bad -values list" -body {
     .cb configure -values "bad \{list"
-} -result "unmatched open brace in list" -returnCodes 1
+} -result "unmatched open brace in list" -returnCodes error
 
 test combobox-1.end "Combobox tests -- cleanup" -body {
     destroy .cb
diff --git a/tests/ttk/image.test b/tests/ttk/image.test
index 5e48d5c..bfc71b8 100644
--- a/tests/ttk/image.test
+++ b/tests/ttk/image.test
@@ -11,7 +11,7 @@ test image-1.2 "Duplicate element" -setup {
     ttk::style element create testElement image test.element
 } -body {
     ttk::style element create testElement image test.element
-} -returnCodes 1 -result "Duplicate element testElement"
+} -returnCodes error -result "Duplicate element testElement"
 
 test image-2.0 "Deletion of displayed image (label)" -setup {
      image create photo test.image -width 10 -height 10
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 649c35f..896ddb0 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -10,22 +10,22 @@ test labelframe-2.1 "Can't use indirect descendant as labelwidget" -body {
     ttk::frame .lf.t
     ttk::checkbutton .lf.t.cb
     .lf configure -labelwidget .lf.t.cb
-} -returnCodes 1 -result "can't *" -match glob \
+} -returnCodes error -result "can't *" -match glob \
   -cleanup { destroy .lf.t } ;
 
 test labelframe-2.2 "Can't use toplevel as labelwidget" -body {
     toplevel .lf.t
     .lf configure -labelwidget .lf.t
-} -returnCodes 1 -result "can't *" -match glob \
+} -returnCodes error -result "can't *" -match glob \
   -cleanup { destroy .lf.t } ;
 
 test labelframe-2.3 "Can't use non-windows as -labelwidget" -body {
     .lf configure -labelwidget BogusWindowName
-} -returnCodes 1 -result {bad window path name "BogusWindowName"}
+} -returnCodes error -result {bad window path name "BogusWindowName"}
 
 test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body {
     .lf configure -labelwidget .nosuchwindow
-} -returnCodes 1 -result {bad window path name ".nosuchwindow"}
+} -returnCodes error -result {bad window path name ".nosuchwindow"}
 
 
 ###
diff --git a/tests/ttk/notebook.test b/tests/ttk/notebook.test
index 3a2a6ff..9b75978 100644
--- a/tests/ttk/notebook.test
+++ b/tests/ttk/notebook.test
@@ -24,11 +24,11 @@ test notebook-1.3 "Cannot add toplevel" -body {
     .nb add [toplevel .nb.t]
 } -cleanup {
     destroy .t.nb
-} -returnCodes 1 -match glob -result "can't add .nb.t*"
+} -returnCodes error -match glob -result "can't add .nb.t*"
 
 test notebook-1.4 "Try to select bad tab" -body {
     .nb select @6000,6000
-} -returnCodes 1 -match glob -result "* not found"
+} -returnCodes error -match glob -result "* not found"
 
 #
 # Now add stuff:
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index c1fc6ac..90c2ac2 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -46,7 +46,7 @@ test panedwindow-1.7 "Make sure empty panedwindow still still doesn't crash" -bo
 
 test panedwindow-1.8 "Re-forget pane" -body {
     .pw forget .pw.f1
-} -returnCodes 1 -result ".pw.f1 is not managed by .pw"
+} -returnCodes error -result ".pw.f1 is not managed by .pw"
 
 test panedwindow-1.end "Cleanup" -body {
     destroy .pw
@@ -118,11 +118,11 @@ test panedwindow-3.0 "configure pane" -body {
 
 test panedwindow-3.1 "configure pane -- errors" -body {
     .pw pane 1 -weight -4
-} -returnCodes 1 -match glob -result "-weight must be nonnegative"
+} -returnCodes error -match glob -result "-weight must be nonnegative"
 
 test panedwindow-3.2 "add pane -- errors" -body {
     .pw add [ttk::label .pw.l] -weight -1
-} -returnCodes 1 -match glob -result "-weight must be nonnegative"
+} -returnCodes error -match glob -result "-weight must be nonnegative"
 
 
 test panedwindow-3.end "cleanup" -body { destroy .pw }
@@ -146,7 +146,7 @@ test panedwindow-4.1 "forget" -body {
 
 test panedwindow-4.2 "forget forgotten" -body {
     .pw forget .pw.l1
-} -returnCodes 1 -result ".pw.l1 is not managed by .pw"
+} -returnCodes error -result ".pw.l1 is not managed by .pw"
 
 # checkorder $winlist --
 #	Ensure that Y coordinates windows in $winlist are strictly increasing.
diff --git a/tests/ttk/progressbar.test b/tests/ttk/progressbar.test
index b9add86..882c604 100644
--- a/tests/ttk/progressbar.test
+++ b/tests/ttk/progressbar.test
@@ -76,7 +76,7 @@ test progressbar-2.5 "error in write trace" -body {
     trace variable PB w { error "YIPES!" ;# }
     .pb step
     set PB		;# NOTREACHED
-} -cleanup { unset PB } -returnCodes 1 -match glob -result "*YIPES!"
+} -cleanup { unset PB } -returnCodes error -match glob -result "*YIPES!"
 
 test progressbar-end "Cleanup" -body {
     destroy .pb
diff --git a/tests/ttk/scrollbar.test b/tests/ttk/scrollbar.test
index 1f8d158..362dab8 100644
--- a/tests/ttk/scrollbar.test
+++ b/tests/ttk/scrollbar.test
@@ -63,7 +63,7 @@ test scale-1.0 "Self-destruction" -body {
     ttk::scale .s -variable v
     pack .s ; update
     .s set 1 ; update
-} -returnCodes 1 -match glob -result "*"
+} -returnCodes error -match glob -result "*"
 
 tcltest::cleanupTests
 
diff --git a/tests/ttk/treetags.test b/tests/ttk/treetags.test
index f91673f..a26d91f 100644
--- a/tests/ttk/treetags.test
+++ b/tests/ttk/treetags.test
@@ -165,7 +165,7 @@ test treetags-2.3 "Virtual events delivered to focus item" -body {
 
 test treetags-2.4 "Bad events" -body {
     $tv tag bind bad <Enter> { puts "Entered!" }
-} -returnCodes 1 -result "unsupported event <Enter>*" -match glob
+} -returnCodes error -result "unsupported event <Enter>*" -match glob
 
 test treetags-3.0 "tag configure - set" -body {
     $tv tag configure tag1 -foreground blue -background red
diff --git a/tests/ttk/treeview.test b/tests/ttk/treeview.test
index d8bc65d..c8f1556 100644
--- a/tests/ttk/treeview.test
+++ b/tests/ttk/treeview.test
@@ -45,33 +45,33 @@ test treeview-1.1 "columns" -body {
 test treeview-1.2 "Bad columns" -body {
     #.tv configure -columns {illegal "list"value}
     ttk::treeview .badtv -columns {illegal "list"value}
-} -returnCodes 1 -result "list element in quotes followed by*" -match glob
+} -returnCodes error -result "list element in quotes followed by*" -match glob
 
 test treeview-1.3 "bad displaycolumns" -body {
     .tv configure -displaycolumns {a b d}
-} -returnCodes 1 -result "Invalid column index d"
+} -returnCodes error -result "Invalid column index d"
 
 test treeview-1.4 "more bad displaycolumns" -body {
     .tv configure -displaycolumns {1 2 3}
-} -returnCodes 1 -result "Column index 3 out of bounds"
+} -returnCodes error -result "Column index 3 out of bounds"
 
 test treeview-1.5 "Don't forget to check negative numbers" -body {
     .tv configure -displaycolumns {1 -2 3}
-} -returnCodes 1 -result "Column index -2 out of bounds"
+} -returnCodes error -result "Column index -2 out of bounds"
 
 # Item creation.
 #
 test treeview-2.1 "insert -- not enough args" -body {
     .tv insert
-} -returnCodes 1 -result "wrong # args: *" -match glob
+} -returnCodes error -result "wrong # args: *" -match glob
 
 test treeview-2.3 "insert -- bad integer index" -body {
     .tv insert {} badindex
-} -returnCodes 1 -result "expected integer *" -match glob
+} -returnCodes error -result "expected integer *" -match glob
 
 test treeview-2.4 "insert -- bad parent node" -body {
     .tv insert badparent end
-} -returnCodes 1 -result "Item badparent not found" -match glob
+} -returnCodes error -result "Item badparent not found" -match glob
 
 test treeview-2.5 "insert -- finaly insert a node" -body {
     .tv insert {} end -id newnode -text "New node"
@@ -83,7 +83,7 @@ test treeview-2.6 "insert -- make sure node was inserted" -body {
 
 test treeview-2.7 "insert -- prevent duplicate node names" -body {
     .tv insert {} end -id newnode
-} -returnCodes 1 -result "Item newnode already exists"
+} -returnCodes error -result "Item newnode already exists"
 
 test treeview-2.8 "insert -- new node at end" -body {
     .tv insert {} end -id lastnode
@@ -125,7 +125,7 @@ test treeview-2.13 "insert -- one more at beginning" -body {
 
 test treeview-2.14 "insert -- bad options" -body {
     .tv insert {} end -badoption foo
-} -returnCodes 1 -result {unknown option "-badoption"}
+} -returnCodes error -result {unknown option "-badoption"}
 
 test treeview-2.15 "insert -- at position 0 w/no children" -body {
     .tv insert newnode 0 -id newnode.n2 -text "Foo"
@@ -201,7 +201,7 @@ test treeview-3.11 "Can't detach root item" -body {
     .tv detach [list {}]
     update
     consistencyCheck .tv
-} -returnCodes 1 -result "Cannot detach root item"
+} -returnCodes error -result "Cannot detach root item"
 consistencyCheck .tv
 
 test treeview-3.12 "Reattach" -body {
@@ -274,7 +274,7 @@ test treeview-4.3 "opened - closed node" -body {
 
 test treeview-5.1 "item -- error checks" -body {
     .tv item newnode -text "Bad values" -values "{bad}list"
-} -returnCodes 1 -result "list element in braces followed by*" -match glob
+} -returnCodes error -result "list element in braces followed by*" -match glob
 
 test treeview-5.2 "item -- error leaves options unchanged " -body {
     .tv item newnode -text
@@ -297,11 +297,11 @@ test treeview-5.5 "set cell" -body {
 
 test treeview-5.6 "set illegal cell" -body {
     .tv set newnode #0 YYY
-} -returnCodes 1 -result "Display column #0 cannot be set"
+} -returnCodes error -result "Display column #0 cannot be set"
 
 test treeview-5.7 "set illegal cell" -body {
     .tv set newnode 3 YY	;# 3 == current #columns
-} -returnCodes 1 -result "Column index 3 out of bounds"
+} -returnCodes error -result "Column index 3 out of bounds"
 
 test treeview-5.8 "set display columns" -body {
     .tv configure -displaycolumns [list 2 1 0]
@@ -317,7 +317,7 @@ test treeview-5.9 "display columns part 2" -body {
 
 test treeview-5.10 "cannot set column -id" -body {
     .tv column #1 -id X
-} -returnCodes 1 -result "Attempt to change read-only option"
+} -returnCodes error -result "Attempt to change read-only option"
 
 test treeview-5.11 "get" -body {
     .tv set newnode #1
@@ -405,7 +405,7 @@ test treeview-7.1 "move" -body {
 
 test treeview-7.2 "illegal move" -body {
    .tv move d d2 end
-} -returnCodes 1 -result "Cannot insert d as a descendant of d2"
+} -returnCodes error -result "Cannot insert d as a descendant of d2"
 
 test treeview-7.3 "illegal move has no effect" -body {
     consistencyCheck .tv
@@ -426,7 +426,7 @@ test treeview-7.5 "replace children - precondition" -body {
 
 test treeview-7.6 "Replace children - illegal move" -body {
     .tv children newnode.n1 [list newnode.n1 newnode.n2 newnode.n3]
-} -returnCodes 1 -result "Cannot insert newnode.n1 as a descendant of newnode.n1"
+} -returnCodes error -result "Cannot insert newnode.n1 as a descendant of newnode.n1"
 
 consistencyCheck .tv
 
@@ -457,7 +457,7 @@ test treeview-8.4 "Selection - clear" -body {
 
 test treeview-8.5 "Selection - bad operation" -body {
     .tv selection badop foo
-} -returnCodes 1 -match glob -result {bad selection operation "badop": must be *}
+} -returnCodes error -match glob -result {bad selection operation "badop": must be *}
 
 ### NEED: more tests for see/yview/scrolling
 
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index f3abdef..8ad7887 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -31,7 +31,7 @@ test ttk-6.1 "Self-destructing checkbutton" -body {
     trace variable sd w [list selfdestruct .sd]
     update
     .sd invoke
-} -returnCodes 1
+} -returnCodes error
 test ttk-6.2 "Checkbutton self-destructed" -body {
     winfo exists .sd
 } -result 0
@@ -145,7 +145,7 @@ test ttk-1.2 "Check style" -body {
 
 test ttk-1.3 "Set bad style" -body {
     .t configure -style "nosuchstyle"
-} -returnCodes 1 -result {Layout nosuchstyle not found}
+} -returnCodes error -result {Layout nosuchstyle not found}
 
 test ttk-1.4 "Original style preserved" -body {
     .t cget -style
@@ -237,11 +237,11 @@ foreach wc $widgetClasses {
 # misc. error detection
 test ttk-3.0 "Bad option" -body {
     ttk::button .bad -badoption foo
-} -returnCodes 1 -result {unknown option "-badoption"} -match glob
+} -returnCodes error -result {unknown option "-badoption"} -match glob
 
 test ttk-3.1 "Make sure widget command not created" -body {
     .bad state disabled
-} -returnCodes 1 -result {invalid command name ".bad"} -match glob
+} -returnCodes error -result {invalid command name ".bad"} -match glob
 
 test ttk-3.2 "Propagate errors from variable traces" -body {
     set A 0
@@ -254,7 +254,7 @@ test ttk-3.2 "Propagate errors from variable traces" -body {
 
 test ttk-3.3 "Constructor failure with cursor" -body {
     ttk::button .b -cursor bottom_right_corner -style BadStyle
-} -returnCodes 1 -result "Layout BadStyle not found"
+} -returnCodes error -result "Layout BadStyle not found"
 
 test ttk-3.4 "SF#2009213" -body {
     ttk::style configure TScale -sliderrelief {}
@@ -390,12 +390,12 @@ test ttk-8.4 "ImageChanged" -body {
 
 test ttk-9.1 "Traces on nonexistant namespaces" -body {
     ttk::checkbutton .tcb -variable foo::bar
-} -returnCodes 1 -result "*parent namespace doesn't exist*" -match glob
+} -returnCodes error -result "*parent namespace doesn't exist*" -match glob
 
 test ttk-9.2 "Traces on nonexistant namespaces II" -body {
     ttk::checkbutton .tcb -variable X
     .tcb configure -variable foo::bar
-} -returnCodes 1 -result "*parent namespace doesn't exist*" -match glob
+} -returnCodes error -result "*parent namespace doesn't exist*" -match glob
 
 test ttk-9.3 "Restore saved options on configure error" -body {
     .tcb cget -variable
@@ -460,7 +460,7 @@ test ttk-10.3 "Check class resource" -body {
 
 test ttk-10.4 "Try to modify class resource" -body {
     .f configure -class Bar
-} -returnCodes 1 -match glob -result "*read-only option*"
+} -returnCodes error -match glob -result "*read-only option*"
 
 test ttk-10.5 "Check class resource again" -body {
     .f cget -class
@@ -537,14 +537,14 @@ test ttk-12.4 "-borderwidth frame option" -body {
 
 test ttk-13.1 "Custom styles -- bad -style option" -body {
     ttk::button .tb1 -style badstyle
-} -returnCodes 1 -result "*badstyle not found*" -match glob
+} -returnCodes error -result "*badstyle not found*" -match glob
 
 test ttk-13.4 "Custom styles -- bad -style option" -body {
     ttk::button .tb1
     .tb1 configure -style badstyle
 } -cleanup {
     destroy .tb1
-} -returnCodes 1 -result "*badstyle not found*" -match glob
+} -returnCodes error -result "*badstyle not found*" -match glob
 
 test ttk-13.5 "Custom layouts -- missing element definition" -body {
     ttk::style layout badstyle {
@@ -562,17 +562,17 @@ test ttk-13.5 "Custom layouts -- missing element definition" -body {
 
 test ttk-14.1 "-variable in nonexistant namespace" -body {
     ttk::checkbutton .tw -variable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-14.2 "-textvariable in nonexistant namespace" -body {
     ttk::label .tw -textvariable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-14.3 "-textvariable in nonexistant namespace" -body {
     ttk::entry .tw -textvariable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-15.1 {Bug 3062331} -setup {
@@ -618,27 +618,27 @@ proc wrong#varargs {varpart args} {
 
 test ttk-ensemble-0 "style element create: insufficient args" -body {
      ttk::style
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs arg ttk::style option]
 
 test ttk-ensemble-1 "style element create: insufficient args" -body {
      ttk::style element
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs arg ttk::style element option]
 
 test ttk-ensemble-2 "style element create: insufficient args" -body {
      ttk::style element create
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs {-option value} ttk::style element create name type]
 
 test ttk-ensemble-3 "style element create: insufficient args" -body {
      ttk::style element create plain.background
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs {-option value} ttk::style element create name type]
 
 test ttk-ensemble-4 "style element create: insufficient args" -body {
      ttk::style element create plain.background from
-} -returnCodes 1 -result [wrong#args theme ?element?]
+} -returnCodes error -result [wrong#args theme ?element?]
 
 test ttk-ensemble-5 "style element create: valid" -body {
      ttk::style element create plain.background from default
diff --git a/tests/unixWm.test b/tests/unixWm.test
index e292d38..cd6394d 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -2471,7 +2471,7 @@ test unixWm-60.5 {wm attributes - bad attribute} -constraints unix -body {
     destroy .t
     toplevel .t
     wm attributes .t -foo
-} -returnCodes 1 -match glob -result {bad attribute "-foo":*}
+} -returnCodes error -match glob -result {bad attribute "-foo":*}
 
 test unixWm-61.1 {Tk_WmCmd procedure, "iconphoto" option} unix {
     list [catch {wm iconph .} msg] $msg
diff --git a/tests/winWm.test b/tests/winWm.test
index d195771..94f18d5 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -188,8 +188,10 @@ test winWm-4.1 {ConfigureTopLevel: menu resizing} win {
 # of the clientarea when a menu wraps so I believe this test to be wrong.
 # Original result was {50 50 50} new result may depend on the default menu
 # font
-test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
+test winWm-5.1 {UpdateGeometryInfo: menu resizing} -constraints win -setup {
+    destroy .t
     set result {}
+} -body {
     toplevel .t
     frame .t.f -width 150 -height 50 -background red
     pack .t.f
@@ -204,11 +206,12 @@ test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
     .t.m add command -label "thisisreallylong"
     update
     lappend result [winfo height .t]
+} -cleanup {
     destroy .t
-
-    set result
-} {50 50 31}
-test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
+} -result {50 50 31}
+test winWm-5.2 {UpdateGeometryInfo: menu resizing} -constraints win -setup {
+    destroy .t
+} -body {
     set result {}
     toplevel .t
     frame .t.f -width 150 -height 50 -background red
@@ -227,28 +230,40 @@ test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
     lappend result [expr {$y - [winfo rooty .t]}]
     destroy .t
     set result
-} {50 50 0}
+} -cleanup {
+    destroy .t
+} -result {50 50 0}
 
-test winWm-6.1 {wm attributes} win {
+test winWm-6.1 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     wm attributes .t
-} {-alpha 1.0 -transparentcolor {} -disabled 0 -fullscreen 0 -toolwindow 0 -topmost 0}
-test winWm-6.2 {wm attributes} win {
+} -cleanup {
+    destroy .t
+} -result {-alpha 1.0 -transparentcolor {} -disabled 0 -fullscreen 0 -toolwindow 0 -topmost 0}
+test winWm-6.2 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     wm attributes .t -disabled
-} 0
-test winWm-6.3 {wm attributes} win {
-    # This isn't quite the correct error message yet, but it works.
+} -cleanup {
+    destroy .t
+} -result {0}
+test winWm-6.3 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
+    # This isn't quite the correct error message yet, but it works.
     toplevel .t
-    list [catch {wm attributes .t -foo} msg] $msg
-} {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-transparentcolor ?color?? ?-disabled ?bool?? ?-fullscreen ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}}
+    wm attributes .t -foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-transparentcolor ?color?? ?-disabled ?bool?? ?-fullscreen ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}
 
-test winWm-6.4 {wm attributes -alpha} win {
-    # Expect this to return all 1.0 {} on pre-2K/XP
+test winWm-6.4 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
+    # Expect this to return all 1.0 {} on pre-2K/XP
     toplevel .t
     set res [wm attributes .t -alpha]
     # we don't return on set yet
@@ -258,72 +273,94 @@ test winWm-6.4 {wm attributes -alpha} win {
     lappend res [wm attributes .t -alpha]
     lappend res [wm attributes .t -alpha 100]
     lappend res [wm attributes .t -alpha]
-    set res
-} {1.0 {} 0.5 {} 0.0 {} 1.0}
+    return $res
+} -cleanup {
+    destroy .t
+} -result {1.0 {} 0.5 {} 0.0 {} 1.0}
 
-test winWm-6.5 {wm attributes -alpha} win {
+test winWm-6.5 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
-    list [catch {wm attributes .t -alpha foo} msg] $msg
-} {1 {expected floating-point number but got "foo"}}
+    wm attributes .t -alpha foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {expected floating-point number but got "foo"}
 
-test winWm-6.6 {wm attributes -alpha} win {
-    # This test is just to show off -alpha
+test winWm-6.6 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
+    # This test is just to show off -alpha
     toplevel .t
     wm attributes .t -alpha 0.2
     pack [label .t.l -text "Alpha Toplevel" -font "Helvetica 18 bold"]
     tk::PlaceWindow .t center
     update
     if {$::tcl_platform(osVersion) >= 5.0} {
-	for {set i 0.2} {$i < 0.99} {set i [expr {$i+0.02}]} {
-	    wm attributes .t -alpha $i
-	    update idle
-	    after 20
-	}
-	for {set i 0.99} {$i > 0.2} {set i [expr {$i-0.02}]} {
-	    wm attributes .t -alpha $i
-	    update idle
-	    after 20
-	}
+    for {set i 0.2} {$i < 0.99} {set i [expr {$i+0.02}]} {
+        wm attributes .t -alpha $i
+        update idle
+        after 20
+    }
+    for {set i 0.99} {$i > 0.2} {set i [expr {$i-0.02}]} {
+        wm attributes .t -alpha $i
+        update idle
+        after 20
     }
-} {}
+    }
+} -cleanup {
+    destroy .t
+} -result {}
 
-test winWm-6.7 {wm attributes -transparentcolor} win {
-    # Expect this to return all "" on pre-2K/XP
+test winWm-6.7 {wm attributes -transparentcolor} -constraints win -setup {
     destroy .t
-    toplevel .t
     set res {}
+} -body {
+    # Expect this to return all "" on pre-2K/XP
+    toplevel .t
     lappend res [wm attributes .t -transparentcolor]
     # we don't return on set yet
     lappend res [wm attributes .t -trans black]
     lappend res [wm attributes .t -trans]
     lappend res [wm attributes .t -trans "#FFFFFF"]
     lappend res [wm attributes .t -trans]
+} -cleanup {
     destroy .t
-    set res
-} [list {} {} black {} "#FFFFFF"]
+} -result [list {} {} black {} "#FFFFFF"]
 
-test winWm-6.8 {wm attributes -transparentcolor} win {
+test winWm-6.8 {wm attributes -transparentcolor} -constraints win -setup {
+    destroy .t
+} -body {
     destroy .t
     toplevel .t
-    list [catch {wm attributes .t -tr foo} msg] $msg
-} {1 {unknown color name "foo"}}
+    wm attributes .t -tr foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {unknown color name "foo"}
+
 
-test winWm-7.1 {deiconify on an unmapped toplevel\
-        will raise the window and set the focus} win {
+test winWm-7.1 {deiconify on an unmapped toplevel will raise \
+        the window and set the focus} -constraints {
+    win
+} -setup {
     destroy .t
+} -body {
     toplevel .t
     lower .t
     focus -force .
     wm deiconify .t
     update
     list [wm stackorder .t isabove .] [focus]
-} {1 .t}
+} -cleanup {
+    destroy .t
+} -result {1 .t}
 
 test winWm-7.2 {deiconify on an already mapped toplevel\
-        will raise the window and set the focus} win {
+        will raise the window and set the focus} -constraints {
+    win
+} -setup {
     destroy .t
+} -body {
     toplevel .t
     lower .t
     update
@@ -331,9 +368,13 @@ test winWm-7.2 {deiconify on an already mapped toplevel\
     wm deiconify .t
     update
     list [wm stackorder .t isabove .] [focus]
-} {1 .t}
+} -cleanup {
+    destroy .t
+} -result {1 .t}
 
-test winWm-7.3 {UpdateWrapper must maintain Z order} win {
+test winWm-7.3 {UpdateWrapper must maintain Z order} -constraints win -setup {
+    destroy .t
+} -body {
     destroy .t
     toplevel .t
     lower .t
@@ -342,10 +383,13 @@ test winWm-7.3 {UpdateWrapper must maintain Z order} win {
     wm resizable .t 0 0
     update
     list $res [wm stackorder .t isbelow .]
-} {1 1}
+} -cleanup {
+    destroy .t
+} -result {1 1}
 
-test winWm-7.4 {UpdateWrapper must maintain focus} win {
+test winWm-7.4 {UpdateWrapper must maintain focus} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     focus -force .t
     update
@@ -353,20 +397,26 @@ test winWm-7.4 {UpdateWrapper must maintain focus} win {
     wm resizable .t 0 0
     update
     list $res [focus]
-} {.t .t}
+} -cleanup {
+    destroy .t
+} -result {.t .t}
+
 
-test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} win {
-    list [catch {wm iconph .} msg] $msg
-} {1 {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
-test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} win {
+test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -body {
+    wm iconph .
+} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     image create photo blank16 -width 16 -height 16
     image create photo blank32 -width 32 -height 32
     # This should just make blank icons for the window
     wm iconphoto .t blank16 blank32
     image delete blank16 blank32
-} {}
+} -cleanup {
+    destroy .t
+} -result {}
 
 test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constraints win -setup {
     proc winwm90click {w} {
@@ -396,7 +446,6 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
         pack [button $w.b -text "Do dialog" -command [list winwm90proc2 $w]]
         bind $w.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     }
-    destroy .t
     global winwm90done
     set winwm90done wait
     toplevel .t
@@ -465,17 +514,17 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
     frame .t.f -background blue -height 200 -width 200
     frame .t.f.x -background red -height 100 -width 100
 } -body {
-     pack .t.f.x
+    pack .t.f.x
     pack .t.f
-    lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
+    lappend aid [after 5000 {set ::winwm92 timeout}] [after 500 {
         wm manage .t.f
         wm iconify .t
-        lappend aid [after 100 {
+        lappend aid [after 500 {
             wm forget .t.f
             wm deiconify .t
-            lappend aid [after 100 {
+            lappend aid [after 500 {
                 pack .t.f
-                lappend aid [after 100 {
+                lappend aid [after 500 {
 		    set ::winwm92 [expr {
 			    [winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
             }]
-- 
cgit v0.12


From 34c8697bb8495ff8c5c31ab6783169df77394e29 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 19:21:01 +0000
Subject: Xcode 11.7 -> 12. Mark more testcases as failsOnUbuntu

---
 .travis.yml         |  4 ++--
 tests/font.test     |  4 ++--
 tests/send.test     |  2 +-
 tests/textDisp.test | 34 +++++++++++++++++-----------------
 tests/textTag.test  |  6 +++---
 tests/textWind.test | 12 ++++++------
 tests/unixFont.test |  2 +-
 tests/winWm.test    |  2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 417c652..ae1178e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,9 +131,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.7/Shared/XQuartz"
+    - name: "macOS/Xcode 12/Shared/XQuartz"
       os: osx
-      osx_image: xcode11.7
+      osx_image: xcode12
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
diff --git a/tests/font.test b/tests/font.test
index fbd0a52..37e5739 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -1280,7 +1280,7 @@ test font-38.9 {ParseFontNameObj procedure: arguments} {
 test font-38.10 {ParseFontNameObj procedure: arguments} {
     list [catch {font actual {times xyz xyz}} msg] $msg
 } {1 {expected integer but got "xyz"}}
-test font-38.12 {ParseFontNameObj procedure: stylelist loop} unixOrPc {
+test font-38.12 {ParseFontNameObj procedure: stylelist loop} {unixOrPc failsOnUbuntu} {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } {-weight bold -slant italic -underline 1 -overstrike 1}
 test font-38.13 {ParseFontNameObj procedure: stylelist error} {
@@ -1351,7 +1351,7 @@ tk scaling 0.5
 test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
 } 24
-test font-44.2 {TkFontGetPoints: size >= 0} noExceed {
+test font-44.2 {TkFontGetPoints: size >= 0} {noExceed failsOnUbuntu} {
     font actual {times 12} -size
 } 12
 
diff --git a/tests/send.test b/tests/send.test
index 16d4202..5bd1ade 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -295,7 +295,7 @@ test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver te
 "if 1 {open bogus_file_name}"
     invoked from within
 "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}}
-test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend} {
+test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} {
     testsend prop root InterpRegistry "10234 bogus\n"
     set result [list [catch {send bogus bogus command} msg] $msg]
     winfo interps
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 2be64ce..7b89111 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -257,7 +257,7 @@ test textDisp-2.5 {LayoutDLine, word wrap} {textfonts} {
     .t insert 1.0 "This isx some sample text for testing."
     list [.t bbox 1.13] [.t bbox 1.14] [.t bbox 1.19]
 } [list [list 96 5 49 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 40 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
-test textDisp-2.6 {LayoutDLine, word wrap} {
+test textDisp-2.6 {LayoutDLine, word wrap} failsOnUbuntu {
     .t configure -wrap word
     .t delete 1.0 end
     .t insert 1.0 "This isxxx some sample text for testing."
@@ -1135,7 +1135,7 @@ test textDisp-8.9 {TkTextChanged} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 8.0} {2.0 8.0}}
-test textDisp-8.10 {TkTextChanged} {
+test textDisp-8.10 {TkTextChanged} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"
@@ -1211,7 +1211,7 @@ test textDisp-9.2 {TkTextRedrawTag} {textfonts} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{1.0 2.0 2.17} {1.0 2.0 2.17}}
-test textDisp-9.3 {TkTextRedrawTag} {
+test textDisp-9.3 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1222,7 +1222,7 @@ test textDisp-9.3 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.4 {TkTextRedrawTag} {
+test textDisp-9.4 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1233,7 +1233,7 @@ test textDisp-9.4 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.5 {TkTextRedrawTag} {
+test textDisp-9.5 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1244,7 +1244,7 @@ test textDisp-9.5 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.6 {TkTextRedrawTag} {
+test textDisp-9.6 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap"
@@ -1255,7 +1255,7 @@ test textDisp-9.6 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20 3.0 3.20} {2.0 2.20 3.0 3.20 eof}}
-test textDisp-9.7 {TkTextRedrawTag} {
+test textDisp-9.7 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"
@@ -1813,7 +1813,7 @@ test textDisp-14.5 {TkTextXviewCmd procedure} {
 test textDisp-14.6 {TkTextXviewCmd procedure} {
     list [catch {.t xview moveto a} msg] $msg
 } {1 {expected floating-point number but got "a"}}
-test textDisp-14.7 {TkTextXviewCmd procedure} {
+test textDisp-14.7 {TkTextXviewCmd procedure} failsOnUbuntu {
     .t delete 1.0 end
     .t insert end xxxxxxxxx\n
     .t insert end "xxxxx xxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx\n"
@@ -2010,7 +2010,7 @@ test textDisp-16.9 {TkTextYviewCmd procedure, "moveto" option} {
 test textDisp-16.10 {TkTextYviewCmd procedure, "moveto" option} {
     list [catch {.t yview moveto gorp} msg] $msg
 } {1 {expected floating-point number but got "gorp"}}
-test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto 0.5
     .t index @0,0
 } {103.0}
@@ -2022,21 +2022,21 @@ test textDisp-16.13 {TkTextYviewCmd procedure, "moveto" option} {
     .t yview moveto 1.1
     .t index @0,0
 } {191.0}
-test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .75
     .t index @0,0
 } {151.60}
-test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .752
     .t index @0,0
 } {151.60}
-test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} {textfonts} {
+test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} textfonts {
     set count [expr {5 * $bigHeight + 150 * $fixedHeight}]
     set extra [expr {0.04 * double($fixedDiff * 150) / double($count)}]
     .t yview moveto [expr {.753 - $extra}]
     .t index @0,0
 } {151.60}
-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .755
     .t index @0,0
 } {151.80}
@@ -2200,7 +2200,7 @@ test textDisp-16.38 {TkTextYviewCmd procedure} {
 test textDisp-16.39 {TkTextYviewCmd procedure} {
     list [catch {.t yview scroll 1.3i pixels} msg] $msg
 } {0 {}}
-test textDisp-16.40 {text count -xpixels} {
+test textDisp-16.40 {text count -xpixels} failsOnUbuntu {
     set res {}
     lappend res [.t count -xpixels 1.0 1.5] \
       [.t count -xpixels 1.5 1.0] \
@@ -3864,7 +3864,7 @@ catch {destroy .t2}
 .t configure -height 1
 update
 
-test textDisp-31.1 {line embedded window height update} {
+test textDisp-31.1 {line embedded window height update} failsOnUbuntu {
     set res {}
     .t delete 1.0 end
     .t insert end "abcd\nefgh\nijkl\nmnop\nqrst\nuvwx\nyx"
@@ -3877,7 +3877,7 @@ test textDisp-31.1 {line embedded window height update} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
 
-test textDisp-31.2 {line update index shifting} {
+test textDisp-31.2 {line update index shifting} failsOnUbuntu {
     set res {}
     .t.f configure -height 100
     update
@@ -3894,7 +3894,7 @@ test textDisp-31.2 {line update index shifting} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
 
-test textDisp-31.3 {line update index shifting} {
+test textDisp-31.3 {line update index shifting} failsOnUbuntu {
     # Should do exactly the same as the above, as long
     # as we are correctly tagging the correct lines for
     # recalculation.  The 'update' and 'delay' must be
diff --git a/tests/textTag.test b/tests/textTag.test
index aed0491..f7935d8 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -693,7 +693,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} haveCourier12 {
     event gen .t <ButtonRelease-1> -state 0x100 -x $x3 -y $y3
     lappend x [.t index current]
 } {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
-test textTag-16.2 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.2 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
     event gen .t <Motion> -x $x2 -y $y2
@@ -758,7 +758,7 @@ test textTag-16.5 {TkTextPickCurrent procedure} haveCourier12 {
     event gen .t <Motion> -x $x2 -y $y2
     .t index current
 } {3.2}
-test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.6 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     foreach i {a b c d} {
 	.t tag remove $i 1.0 end
@@ -770,7 +770,7 @@ test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 {
     update
     .t index current
 } {3.1}
-test textTag-16.7 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.7 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     foreach i {a b c d} {
 	.t tag remove $i 1.0 end
diff --git a/tests/textWind.test b/tests/textWind.test
index c665006..8d81647 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -552,7 +552,7 @@ test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} {
     update
     list [.t bbox .f] [.t bbox 1.13]
 } {{5 18 127 20} {132 21 7 13}}
-test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} {
+test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
@@ -580,7 +580,7 @@ test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} {
     list [.t bbox .f] [.t bbox 1.13]
 } {{5 18 210 65} {}}
 
-test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} {
+test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     pack forget .t
@@ -592,7 +592,7 @@ test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} {
 } {30x20+119+55}
 place forget .t
 pack .t
-test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} {
+test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     pack forget .t
@@ -674,7 +674,7 @@ test textWind-12.1 {EmbWinUndisplayProc procedure, mapping/unmapping} {
     set x
 } {created mapped modified replaced unmapped mapped off-screen unmapped}
 
-test textWind-13.1 {EmbWinBboxProc procedure} {
+test textWind-13.1 {EmbWinBboxProc procedure} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -831,7 +831,7 @@ test textWind-16.1 {EmbWinTextStructureProc procedure} {
     winfo ismapped .f
 } 0
 pack .t
-test textWind-16.2 {EmbWinTextStructureProc procedure} {
+test textWind-16.2 {EmbWinTextStructureProc procedure} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
@@ -856,7 +856,7 @@ test textWind-16.3 {EmbWinTextStructureProc procedure} {
     update
 } {}
 pack .t
-test textWind-16.4 {EmbWinTextStructureProc procedure} {
+test textWind-16.4 {EmbWinTextStructureProc procedure} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 8129279..f4cc3dd 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -116,7 +116,7 @@ test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {uni
 test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
-test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix {
+test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {unix failsOnUbuntu} {
     lindex [font actual {-family courier -size 37}] 3
 } {37}
 test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix {
diff --git a/tests/winWm.test b/tests/winWm.test
index 94f18d5..81447a9 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -404,7 +404,7 @@ test winWm-7.4 {UpdateWrapper must maintain focus} -constraints win -setup {
 
 test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -body {
     wm iconph .
-} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}
 test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -setup {
     destroy .t
 } -body {
-- 
cgit v0.12


From 1c25ebd3a22d5227b0b866977430ba4851d9de44 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 26 Sep 2020 19:07:37 +0000
Subject: Mark 4 more testcases as failsOnUbuntu

---
 tests/textDisp.test | 6 +++---
 tests/winWm.test    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index 7b89111..520b26b 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1193,7 +1193,7 @@ test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} {
     update idletasks
 } {}
 
-test textDisp-9.1 {TkTextRedrawTag} {
+test textDisp-9.1 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -3931,7 +3931,7 @@ test textDisp-31.4 {line embedded image height update} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
 
-test textDisp-31.5 {line update index shifting} {
+test textDisp-31.5 {line update index shifting} failsOnUbuntu {
     set res {}
     textest configure -height 100
     update ; after 1000 ; update
@@ -3948,7 +3948,7 @@ test textDisp-31.5 {line update index shifting} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
 
-test textDisp-31.6 {line update index shifting} {
+test textDisp-31.6 {line update index shifting} failsOnUbuntu {
     # Should do exactly the same as the above, as long
     # as we are correctly tagging the correct lines for
     # recalculation.  The 'update' and 'delay' must be
diff --git a/tests/winWm.test b/tests/winWm.test
index 81447a9..ab99b48 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -507,7 +507,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
     destroy .tx .t .sd
 } -result ok
 
-test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
+test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -constraints failsOnUbuntu -setup {
     destroy .t
     toplevel .t
     set winwm92 {}
-- 
cgit v0.12


From d1e2513a1184139c90d858f109d8ea796a64675e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 27 Sep 2020 13:15:51 +0000
Subject: \t -> real tab character

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae1178e..517857e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,10 @@ jobs:
         - make install
         - make test-classic >out-classic.txt
         - cat out-classic.txt
-        - grep -q "Failed\t0" out-classic.txt
+        - grep -q "Failed	0" out-classic.txt
         - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
-        - grep -q "Failed\t0" out-ttk.txt
+        - grep -q "Failed	0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
-- 
cgit v0.12