Merge 8.6

13 files changed, 102 insertions, 102 deletions

diff --git a/tests/bind.test b/tests/bind.test
index 718c609..9d581ea 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7037,7 +7037,7 @@ test bind-36.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-} -result {1}
+} -result 1
 
 # cleanup
 cleanupTests
diff --git a/tests/entry.test b/tests/entry.test
index 9045822..262447f 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -1534,7 +1534,7 @@ test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e insert end "runs off the end of the window quite a bit."
     .e xview 0
     update
-    .e xview -4
+    .e xview -1
     .e index @0
 } -cleanup {
     destroy .e
@@ -1618,7 +1618,7 @@ test entry-5.3 {ConfigureEntry procedure, -textvariable} -setup {
 } -body {
     .e insert 0 "Some text"
     .e configure -textvariable x
-    return $x
+    set x
 } -cleanup {
     destroy .e
 } -result {Some text}
@@ -1653,7 +1653,7 @@ test entry-5.5 {ConfigureEntry procedure} -setup {
     lappend x [selection get]
     .e1 configure -exportselection 1
     lappend x [selection get]
-    return $x
+    set x
 } -cleanup {
     destroy .e1 .e2
 } -result {{This is so} {This is so} 1234}
@@ -2104,7 +2104,7 @@ test entry-8.2 {DeleteChars procedure} -setup {
     .e configure -textvariable contents -xscrollcommand scroll
     set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
-    .e delete -2 2
+    .e delete -1 2
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2835,7 +2835,7 @@ test entry-13.23 {GetEntryIndex procedure} -body {
     .e insert 0 012345678901234567890
     .e xview 4
     update
-    .e index -10
+    .e index -1
 } -cleanup {
     destroy .e
 } -result 0
@@ -3052,7 +3052,7 @@ test entry-19.1 {entry widget validation} -setup {
         -background red -foreground white
     pack .e
     .e insert 0 a
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 1 0 a {} a all key}
@@ -3084,7 +3084,7 @@ test entry-19.3 {entry widget validation} -setup {
     pack .e
     .e insert 0 ab   ;# previous settings
     .e insert end c
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 1 2 abc ab c all key}
@@ -3116,7 +3116,7 @@ test entry-19.5 {entry widget validation} -setup {
     pack .e
     .e insert 0 a123bc   ;# previous settings
     .e delete 2
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 0 2 a13bc a123bc 2 all key}
@@ -3133,7 +3133,7 @@ test entry-19.6 {entry widget validation} -setup {
     .e insert 0 a13bc   ;# previous settings
     .e configure -validate key
     .e delete 1 3
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 0 1 abc a13bc 13 key key}
@@ -3150,7 +3150,7 @@ test entry-19.7 {entry widget validation} -setup {
     .e insert end abc                 ;# previous settings
     set ::vVals {}
     .e insert end d
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3169,7 +3169,7 @@ test entry-19.8 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focus focusin}
@@ -3190,7 +3190,7 @@ test entry-19.9 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focus focusout}
@@ -3208,7 +3208,7 @@ test entry-19.10 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} all focusin}
@@ -3229,7 +3229,7 @@ test entry-19.11 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} all focusout}
@@ -3247,7 +3247,7 @@ test entry-19.12 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focusin focusin}
@@ -3266,7 +3266,7 @@ test entry-19.13 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3285,7 +3285,7 @@ test entry-19.14 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3307,7 +3307,7 @@ test entry-19.15 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focusout focusout}
diff --git a/tests/grid.test b/tests/grid.test
index c138479..3e67b6e 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -2039,7 +2039,7 @@ test grid-23 {grid configure -in leaked from previous master - bug
     pack forget .f
     update
     winfo ismapped .t ; # must return 1
-} {1}
+} 1
 grid_reset 23
 
 test grid-24.1 {<<NoManagedChild>> fires on last grid forget} -setup {
diff --git a/tests/listbox.test b/tests/listbox.test
index 0107326..3520f99 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -587,7 +587,7 @@ test listbox-3.36 {ListboxWidgetCmd procedure, "delete" option} -setup {
 } -body {
     listbox .l2
     .l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
-    .l2 delete -3 2
+    .l2 delete -1 2
     .l2 get 0 end
 } -cleanup {
     destroy .l2
@@ -597,7 +597,7 @@ test listbox-3.37 {ListboxWidgetCmd procedure, "delete" option} -setup {
 } -body {
     listbox .l2
     .l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
-    .l2 delete -3 -1
+    .l2 delete -1 -1
     .l2 get 0 end
 } -cleanup {
     destroy .l2
@@ -684,10 +684,10 @@ test listbox-3.49 {ListboxWidgetCmd procedure, "get" option} -body {
     .l get -1
 } -result {}
 test listbox-3.50 {ListboxWidgetCmd procedure, "get" option} -body {
-    .l get -2 -1
+    .l get -1 -1
 } -result {}
 test listbox-3.51 {ListboxWidgetCmd procedure, "get" option} -body {
-    .l get -2 3
+    .l get -1 3
 } -result {el0 el1 el2 el3}
 test listbox-3.52 {ListboxWidgetCmd procedure, "get" option} -body {
     .l get 12 end
@@ -2129,7 +2129,7 @@ test listbox-10.19 {GetListboxIndex procedure} -setup {
     pack [listbox .l]
     .l insert 0 el0 el1 el2 el3 el4 el5 el6 el7 el8 el9 el10 el11
     update
-    .l index -2
+    .l index -1
 } -cleanup {
     destroy .l
 } -result  -1
@@ -2378,7 +2378,7 @@ test listbox-15.4 {ListboxSelect procedure, boundary conditions for indices} -bo
     .l delete 0 end
     .l insert 0 a b c d e f
     .l select clear 0 end
-    .l select set -2 -1
+    .l select set -1 -1
     .l curselection
 } -result {}
 test listbox-15.5 {ListboxSelect procedure, boundary conditions for indices} -body {
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index e02e3a8..873e564 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -197,7 +197,7 @@ test scrollbar-3.14.1 {ScrollbarWidgetCmd procedure, "cget" option} emptyTest {
 destroy .s2
 test scrollbar-3.15 {ScrollbarWidgetCmd procedure, "configure" option} {
     llength [.s configure]
-} {20}
+} 20
 test scrollbar-3.16 {ScrollbarWidgetCmd procedure, "configure" option} {
     list [catch {.s configure -bad} msg] $msg
 } {1 {unknown option "-bad"}}
@@ -230,7 +230,7 @@ test scrollbar-3.24 {ScrollbarWidgetCmd procedure, "delta" option} {
 } {1 {expected integer but got "xxyz"}}
 test scrollbar-3.25 {ScrollbarWidgetCmd procedure, "delta" option} {
     format {%.6g} [.s delta 20 0]
-} {0}
+} 0
 test scrollbar-3.26 {ScrollbarWidgetCmd procedure, "delta" option} {
     format {%.6g} [.s delta 0 20]
 } [format %.6g [expr {20.0/([getTroughSize .s]-1)}]]
@@ -262,20 +262,20 @@ test scrollbar-3.32 {ScrollbarWidgetCmd procedure, "fraction" option} {
 } {1 {expected integer but got "bogus"}}
 test scrollbar-3.33 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 0 0]
-} {0}
+} 0
 test scrollbar-3.34 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 0 1000]
-} {1}
+} 1
 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} x11 {
     format {%.6g} [.s fraction 4 179]
-} {1}
+} 1
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s]}]]
-} {1}
+} 1
 test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
@@ -309,7 +309,7 @@ if {[testConstraint testmetrics]} {
 update
 test scrollbar-3.42 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.t.s fraction 100 0]
-} {0}
+} 0
 destroy .t
 test scrollbar-3.43 {ScrollbarWidgetCmd procedure, "get" option} {
     list [catch {.s get a} msg] $msg
diff --git a/tests/send.test b/tests/send.test
index 403a207..aad7032 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -401,14 +401,14 @@ test send-10.4 {SendEventProc procedure, leading nulls, bogus commands} {secures
     set a null
     update
     set a
-} {44}
+} 44
 test send-10.5 {SendEventProc procedure, extraneous command options} {secureserver testsend} {
     testsend prop comm Comm \
 	    "c\n-n tktest\n-x miscellanous\n-y who knows?\n-s set a new\n"
     set a null
     update
     set a
-} {new}
+} new
 test send-10.6 {SendEventProc procedure, unknown interpreter} {secureserver testsend} {
     testsend prop [winfo id .f] Comm {}
     testsend prop comm Comm \
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 9cf10a4..e3c7009 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -1872,7 +1872,7 @@ test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e insert end "runs off the end of the window quite a bit."
     .e xview 0
     update
-    .e xview -4
+    .e xview -1
     .e index @0
 } -cleanup {
     destroy .e
@@ -2393,7 +2393,7 @@ test spinbox-8.2 {DeleteChars procedure} -setup {
     .e insert 0 abcde
     update idletasks
     set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
-    .e delete -2 2
+    .e delete -1 2
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -3122,7 +3122,7 @@ test spinbox-13.23 {GetSpinboxIndex procedure} -body {
     .e insert 0 012345678901234567890
     .e xview 4
     update
-    .e index -10
+    .e index -1
 } -cleanup {
     destroy .e
 } -result 0
diff --git a/tests/text.test b/tests/text.test
index 026e283..9115195 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -7052,13 +7052,13 @@ test text-28.1 {bug fix - 624372, ControlUtfProc long lines} -body {
 
 test text-29.1 {tabs - must be positive and must be increasing} -body {
     pack [text .t -wrap none]
-    .t configure -tabs {0}
+    .t configure -tabs 0
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {tab stop "0" is not at a positive distance}
 test text-29.2 {tabs - must be positive and must be increasing} -body {
     pack [text .t -wrap none]
-    .t configure -tabs {-5}
+    .t configure -tabs -5
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {tab stop "-5" is not at a positive distance}
@@ -7688,7 +7688,7 @@ test text-33.7 {peer widget -start, -end} -body {
     return $res
 } -cleanup {
     destroy .t
-} -returnCodes {2} -result {}
+} -returnCodes 2 -result {}
 test text-33.8 {peer widget -start, -end} -body {
     text .t
     for {set i 1} {$i < 100} {incr i} {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index d1b13ee..aeb1a70 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -223,9 +223,9 @@ test textDisp-1.1 {GetStyle procedure, priorities and tab stops} {
     .t delete 1.0 end
     .t insert 1.0 "x\ty"
     .t tag delete x y z
-    .t tag configure x -tabs {50}
+    .t tag configure x -tabs 50
     .t tag configure y -foreground black
-    .t tag configure z -tabs {70}
+    .t tag configure z -tabs 70
     .t tag add x 1.0 1.end
     .t tag add y 1.0 1.end
     .t tag add z 1.0 1.end
@@ -233,7 +233,7 @@ test textDisp-1.1 {GetStyle procedure, priorities and tab stops} {
     set x [lindex [.t bbox 1.2] 0]
     .t tag configure z -tabs {}
     lappend x [lindex [.t bbox 1.2] 0]
-    .t tag configure z -tabs {30}
+    .t tag configure z -tabs 30
     .t tag raise x
     update idletasks
     lappend x [lindex [.t bbox 1.2] 0]
@@ -504,7 +504,7 @@ test textDisp-2.24 {LayoutDLine, tabs, saving from first chunk} {textfonts} {
     .t tag add x 1.0 end
     .t tag add y 1.1 end
     lindex [.t bbox 1.3] 0
-} {75}
+} 75
 test textDisp-2.25 {LayoutDLine, tabs, breaking chunks at tabs} {textfonts} {
     .t delete 1.0 end
     .t tag delete x
@@ -718,7 +718,7 @@ test textDisp-4.12 {UpdateDisplayInfo, filling in extra vertical space} {
     .t yview moveto 1
     updateText
     winfo ismapped .b
-} {0}
+} 0
 .t configure -wrap word
 .t delete 1.0 end
 .t insert end "Line 1\nLine 2\nLine 3\nLine 4\nLine 5\nLine 6\nLine 7\n"
@@ -1828,7 +1828,7 @@ test textDisp-13.11 {TkTextSeeCmd procedure} {} {
     set res [.top2.t2 compare $ref == $new]
     destroy .top2
     set res
-} {0}
+} 0
 wm geom . {}
 
 .t configure -wrap none
@@ -2017,7 +2017,7 @@ test textDisp-15.8 {Scrolling near end of window} {
     set res [.tf.f.t compare $newind > $refind]
     destroy .tf
     set res
-} {1}
+} 1
 
 .t configure -wrap char
 .t delete 1.0 end
@@ -2177,7 +2177,7 @@ test textDisp-16.28 {TkTextYviewCmd procedure, "scroll" option, forward pages} {
 	incr res -1
     }
     set res
-} {102}
+} 102
 test textDisp-16.29 {TkTextYviewCmd procedure, "scroll" option, forward pages} {
     .t configure -height 1
     updateText
@@ -2645,66 +2645,66 @@ test textDisp-19.11 {GetYView procedure} {
 } {0.5 1.0}
 test textDisp-19.11.2 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 1.0 end
-} {20}
+} 20
 test textDisp-19.11.3 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines end 1.0
-} {-20}
+} -20
 test textDisp-19.11.4 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 1.1 1.3
-} {0}
+} 0
 test textDisp-19.11.5 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.1
-} {0}
+} 0
 test textDisp-19.11.5.1 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.5
-} {0}
+} 0
 test textDisp-19.11.6 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.24
-} {1}
+} 1
 test textDisp-19.11.7 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.40
-} {2}
+} 2
 test textDisp-19.11.8 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines "16.0 displaylineend +1c" "16.0 lineend"
-} {3}
+} 3
 test textDisp-19.11.9 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 "16.0 lineend"
-} {4}
+} 4
 test textDisp-19.11.10 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 "16.0 +4displaylines"
-} {4}
+} 4
 test textDisp-19.11.11 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 "16.0 +2displaylines"
-} {2}
+} 2
 test textDisp-19.11.12 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines "16.0 +1displayline" "16.0 +2displaylines -1c"
-} {0}
+} 0
 .t tag configure elide -elide 1
 test textDisp-19.11.13 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "16.0 +1displaylines" "16.0 +1displaylines +6c"
     .t count -displaylines 16.0 "16.0 +4displaylines"
-} {4}
+} 4
 test textDisp-19.11.14 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "16.0 +1displaylines" "16.0 +1displaylines displaylineend"
     .t count -displaylines 16.0 "16.0 +4displaylines"
-} {4}
+} 4
 test textDisp-19.11.15 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "16.0 +1displaylines" "16.0 +2displaylines"
     .t count -displaylines 16.0 "16.0 +4displaylines -1c"
-} {3}
+} 3
 test textDisp-19.11.15a {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "16.0 +1displaylines" "16.0 +2displaylines"
     .t count -displaylines 16.0 "16.0 +4displaylines"
-} {4}
+} 4
 test textDisp-19.11.16 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "14.0"
     .t count -displaylines 12.0 16.0
-} {2}
+} 2
 test textDisp-19.11.17 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "14.0"
@@ -2725,7 +2725,7 @@ test textDisp-19.11.19 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "16.0 +1displaylines"
     .t count -displaylines 12.0 17.0
-} {4}
+} 4
 test textDisp-19.11.20 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "16.0 +1displaylines"
@@ -3492,7 +3492,7 @@ test textDisp-26.5 {AdjustForTab procedure, numeric alignment} {
     .t tag add y 1.2
     .t tag add y 1.5
     lindex [.t bbox 1.3] 0
-} {120}
+} 120
 test textDisp-26.6 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\t1,456.234
@@ -3501,7 +3501,7 @@ test textDisp-26.6 {AdjustForTab procedure, numeric alignment} {
     .t tag add x 1.0 end
     .t tag add y 1.2
     lindex [.t bbox 1.7] 0
-} {120}
+} 120
 test textDisp-26.7 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\t1.456.234,7
@@ -3510,7 +3510,7 @@ test textDisp-26.7 {AdjustForTab procedure, numeric alignment} {
     .t tag add x 1.0 end
     .t tag add y 1.2
     lindex [.t bbox 1.11] 0
-} {120}
+} 120
 test textDisp-26.8 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\ttest
@@ -3519,7 +3519,7 @@ test textDisp-26.8 {AdjustForTab procedure, numeric alignment} {
     .t tag add x 1.0 end
     .t tag add y 1.2
     lindex [.t bbox 1.6] 0
-} {120}
+} 120
 test textDisp-26.9 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\t1234
@@ -3528,7 +3528,7 @@ test textDisp-26.9 {AdjustForTab procedure, numeric alignment} {
     .t tag add x 1.0 end
     .t tag add y 1.2
     lindex [.t bbox 1.6] 0
-} {120}
+} 120
 test textDisp-26.10 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\t1.234567
@@ -3537,7 +3537,7 @@ test textDisp-26.10 {AdjustForTab procedure, numeric alignment} {
     .t tag add x 1.0 end
     .t tag add y 1.5
     lindex [.t bbox 1.3] 0
-} {120}
+} 120
 test textDisp-26.11 {AdjustForTab procedure, numeric alignment} {
     .t delete 1.0 end
     .t insert 1.0 a\tx=1.234567
@@ -3547,7 +3547,7 @@ test textDisp-26.11 {AdjustForTab procedure, numeric alignment} {
     .t tag add y 1.7
     .t tag add y 1.9
     lindex [.t bbox 1.5] 0
-} {120}
+} 120
 test textDisp-26.12 {AdjustForTab procedure, adjusting chunks} {
     .t delete 1.0 end
     .t insert 1.0 a\tx1.234567
@@ -3560,7 +3560,7 @@ test textDisp-26.12 {AdjustForTab procedure, adjusting chunks} {
     .t window create 1.3 -window .b
     updateText
     lindex [.t bbox 1.5] 0
-} {120}
+} 120
 test textDisp-26.13 {AdjustForTab procedure, not enough space} {textfonts} {
     .t delete 1.0 end
     .t insert 1.0 "abc\txyz\tqrs\txyz\t0"
@@ -3717,7 +3717,7 @@ test textDisp-27.7.2 {SizeOfTab procedure, fractional tab interpolation problem}
     .t configure -tabs $precisetab
     updateText
     expr {[lindex $res 0] - [lindex [.t bbox 1.20] 0]}
-} {0}
+} 0
 
 .t configure -wrap char -tabs {} -width 20
 updateText
@@ -3733,7 +3733,7 @@ test textDisp-27.9 {SizeOfTab procedure, left alignment} {textfonts} {
     .t delete 1.0 end
     .t insert 1.0 a\txyzzyabc
     .t tag delete x
-    .t tag configure x -tabs {120}
+    .t tag configure x -tabs 120
     .t tag add x 1.0 end
     list [.t bbox 1.3] [.t bbox 1.4]
 } [list [list 131 5 13 $fixedHeight] [list 4 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
@@ -3749,7 +3749,7 @@ test textDisp-27.11 {SizeOfTab procedure, making tabs at least as wide as a spac
     .t delete 1.0 end
     .t insert 1.0 abc\tdefghijklmnopqrst
     .t tag delete x
-    .t tag configure x -tabs {120}
+    .t tag configure x -tabs 120
     .t tag add x 1.0 end
     list [.t bbox 1.5] [.t bbox 1.6]
 } [list [list 131 5 13 $fixedHeight] [list 4 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
@@ -3922,14 +3922,14 @@ test textDisp-30.1 {elidden text joining multiple logical lines} {
     .t2.t tag configure elidden -elide 1 -background red
     .t2.t tag add elidden 1.2 3.2
     .t2.t count -displaylines 1.0 end
-} {1}
+} 1
 test textDisp-30.2 {elidden text joining multiple logical lines} {
     .t2.t delete 1.0 end
     .t2.t insert 1.0 "1111\n2222\n3333"
     .t2.t tag configure elidden -elide 1 -background red
     .t2.t tag add elidden 1.2 2.2
     .t2.t count -displaylines 1.0 end
-} {2}
+} 2
 catch {destroy .t2}
 
 .t configure -height 1
@@ -4236,7 +4236,7 @@ test textDisp-33.3 {one line longer than fits in the widget} {
     # Each line should have been recalculated just once
     .tt debug 0
     expr {[llength $tk_textHeightCalc] == [.tt count -displaylines 1.0 end]}
-} {1}
+} 1
 test textDisp-33.4 {one line longer than fits in the widget} {
     destroy .tt
     pack [text .tt -wrap char]
diff --git a/tests/textIndex.test b/tests/textIndex.test
index 310db6a..646c0a3 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -809,7 +809,7 @@ test textIndex-19.12.1 {Display lines} {
 
 test textIndex-19.12.2 {Display lines} {
     .t compare [.t index "2.50 + 100 displaylines"] == "end - 1 c"
-} {1}
+} 1
 
 test textIndex-19.13 {Display lines} {
     destroy {*}[pack slaves .]
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 177dab5..d7a989a 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -71,7 +71,7 @@ test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} {
 } {1 {font "" doesn't exist}}
 test unixfont-1.2 {TkpGetNativeFont procedure: native} x11 {
     font measure fixed 0
-} {6}
+} 6
 
 test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} x11 {
     font actual {-size 10}
@@ -116,7 +116,7 @@ test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {
 } {courier}
 test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} x11 {
     lindex [font actual {-family courier -size 37}] 3
-} {37}
+} 37
 test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} x11 {
     # On Linux, XListFonts() was returning names for fonts that do not
     # actually exist, causing the subsequent XLoadQueryFont() to fail
@@ -174,7 +174,7 @@ test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} x11 {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($ax*2.5)],1
-} {2}
+} 2
 test unixfont-5.10 {Tk_MeasureChars procedure: TK_AT_LEAST_ONE} x11 {
     .b.l config -text "000000000000"
     getsize
@@ -243,7 +243,7 @@ test unixfont-8.1 {AllocFont procedure: use old font} x11 {
 } {}
 test unixfont-8.2 {AllocFont procedure: parse information from XLFD} x11 {
     expr {[lindex [font actual {-family times -size 0}] 3] == 0}
-} {0}
+} 0
 test unixfont-8.3 {AllocFont procedure: can't parse info from name} x11 {
     catch {unset fontArray}
     # check that font actual returns the correct attributes.
@@ -263,7 +263,7 @@ test unixfont-8.4 {AllocFont procedure: classify characters} x11 {
 } [expr $cx*13]
 test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} x11 {
     font metrics $courier -fixed
-} {1}
+} 1
 test unixfont-8.6 {AllocFont procedure: setup widths of special chars} x11 {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 39a68ae..3c9e46e 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -412,7 +412,7 @@ test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} unix {
     wm geom .t +0+0
     wm iconify .t
     winfo ismapped .t
-} {0}
+} 0
 test unixWm-9.4 {TkWmMapWindow procedure, icon windows} unix {
     destroy .t
     toplevel .t -width 100 -height 50 -bg blue
@@ -420,14 +420,14 @@ test unixWm-9.4 {TkWmMapWindow procedure, icon windows} unix {
     wm iconwindow . .t
     update
     set result [winfo ismapped .t]
-} {0}
+} 0
 test unixWm-9.5 {TkWmMapWindow procedure, normal windows} unix {
     destroy .t
     toplevel .t -width 200 -height 20
     wm geom .t +0+0
     update
     winfo ismapped .t
-} {1}
+} 1
 
 test unixWm-10.1 {TkWmDeadWindow procedure, canceling UpdateGeometry idle handler} unix {
     destroy .t
@@ -661,7 +661,7 @@ test unixWm-18.1 {Tk_WmCmd procedure, "frame" option} unix {
 } {1 {wrong # args: should be "wm frame window"}}
 test unixWm-18.2 {Tk_WmCmd procedure, "frame" option} {unix nonPortable} {
     expr [wm frame .t] == [winfo id .t]
-} {0}
+} 0
 test unixWm-18.3 {Tk_WmCmd procedure, "frame" option} {unix nonPortable} {
     destroy .t2
     toplevel .t2
@@ -671,7 +671,7 @@ test unixWm-18.3 {Tk_WmCmd procedure, "frame" option} {unix nonPortable} {
     set result [expr [wm frame .t2] == [winfo id .t2]]
     destroy .t2
     set result
-} {1}
+} 1
 
 test unixWm-19.1 {Tk_WmCmd procedure, "geometry" option} unix {
     list [catch {wm geometry .t 12 13} msg] $msg
@@ -782,7 +782,7 @@ test unixWm-21.4 {Tk_WmCmd procedure, "group" option, make window exist} {unix t
     set result [expr [testwrapper .t2] - [lindex $hints 8]]
     destroy .t2
     set result
-} {0}
+} 0
 test unixWm-21.5 {Tk_WmCmd procedure, "group" option, create leader wrapper} {unix testwrapper} {
     destroy .t2
     destroy .t3
@@ -861,7 +861,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     set result [winfo ismapped .t2]
     destroy .t2
     set result
-} {0}
+} 0
 test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     toplevel .t2
@@ -1734,10 +1734,10 @@ test unixWm-48.10 {ParseGeometry procedure} unix {
 } {1 {bad geometry specifier "+20+10z"}}
 test unixWm-48.11 {ParseGeometry procedure} unix {
     catch {wm geometry .t +-10+20}
-} {0}
+} 0
 test unixWm-48.12 {ParseGeometry procedure} unix {
     catch {wm geometry .t +30+-10}
-} {0}
+} 0
 test unixWm-48.13 {ParseGeometry procedure, resize causes window to move} unix {
     destroy .t
     toplevel .t -width 200 -height 200
@@ -2235,7 +2235,7 @@ test unixWm-54.2 {TkpMakeMenuWindow procedure, setting override_redirect} {unix
     set result [wm overrideredirect .m]
     destroy .m
     set result
-} {1}
+} 1
 
 # No tests for TkGetPointerCoords, CreateWrapper, or GetMaxSize.
 
diff --git a/tests/winSend.test b/tests/winSend.test
index 31c800e..9286884 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -152,7 +152,7 @@ test winSend-3.1 {TkGetInterpNames} winSend {
     set origLength [llength $currentInterps]
     set newLength [llength [winfo interps]]
     expr {($newLength - 2) == $origLength}
-} {1}
+} 1
 
 test winSend-4.1 {DeleteProc - changing name of app} winSend {
     newApp a
@@ -171,7 +171,7 @@ test winSend-5.1 {ExecuteRemoteObject - no error} winSend {
 	}
     }
     list [send $interp {send [tk appname] {expr {2 / 1}}}]
-} {2}
+} 2
 test winSend-5.2 {ExecuteRemoteObject - error} winSend {
     set newInterps [winfo interps]
     foreach interp $newInterps {
@@ -268,7 +268,7 @@ test winSend-6.8 {SendDDEServer - XTYP_WILDCONNECT} winSend {
     }
     set command "dde services Tk {}"
     list [catch "send \{$interp\} \{$command\}"]
-} {0}
+} 0
 
 test winSend-7.1 {DDEExitProc} winSend {
     newApp testApp
@@ -312,10 +312,10 @@ test winSend-10.7 {Tk_DDEObjCmd - services wrong num args} winSend {
 } {1 {wrong # args: should be "dde services serviceName topicName"}}
 test winSend-10.8 {Tk_DDEObjCmd - null service name} winSend {
     list [catch {dde services {} {tktest #2}}]
-} {0}
+} 0
 test winSend-10.9 {Tk_DDEObjCmd - null topic name} winSend {
     list [catch {dde services {Tk} {}}]
-} {0}
+} 0
 test winSend-10.10 {Tk_DDEObjCmd - execute - nothing to execute} winSend {
     set newInterps [winfo interps]
     foreach interp $newInterps {