(cherry-pick): Require Tcltest 2.2 as a miminum. Run X11 testcases on Travis in 3 Ubuntu variants: Xenial, Bionic and Focal. (MacOS/XQuartz not working yet)

101 files changed, 501 insertions, 465 deletions

diff --git a/.fossil-settings/encoding-glob b/.fossil-settings/encoding-glob
index 7175730..1dd88e7 100644
--- a/.fossil-settings/encoding-glob
+++ b/.fossil-settings/encoding-glob
@@ -4,3 +4,7 @@ win/makefile.vc
 win/mkd.bat
 win/rmd.bat
 win/rules.vc
+win/rc/*.bmp
+win/rc/*.cur
+win/rc/*.ico
+win/rc/*.rc
diff --git a/.gitignore b/.gitignore
index 9f57b81..a49e849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.bundle
 *.dll
 *.dylib
+*.dylib.E
 *.exe
 *.exp
 *.lib
@@ -14,6 +15,7 @@
 .fslckout
 Makefile
 Tk-Info.plist
+Wish-Info.plist
 autom4te.cache
 config.cache
 config.log
@@ -55,5 +57,5 @@ unix/tclIndex
 win/Debug*
 win/Release*
 win/*.manifest
-win/nmhlp-out.txt
 win/nmakehlp.out
+win/nmhlp-out.txt
diff --git a/.travis.yml b/.travis.yml
index 5015f19..5a03c08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
       - gcc-multilib
       - tcl-dev
       - libx11-dev
+      - xvfb
   homebrew:
     packages:
       - tcl-tk
@@ -22,16 +23,43 @@ jobs:
     - name: "Linux/GCC/Shared"
       os: linux
       dist: focal
+      services:
+        - xvfb
       compiler: gcc
       env:
         - BUILD_DIR=unix
+      script: &x11gui
+        - make binaries libraries tktest
+        - make install
+        - make test
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
+      services:
+        - xvfb
       compiler: gcc
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-xft"
+      script: *x11gui
+    - name: "Linux/GCC/Shared/bionic"
+      os: linux
+      dist: bionic
+      services:
+        - xvfb
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
+    - name: "Linux/GCC/Shared/xenial"
+      os: linux
+      dist: xenial
+      services:
+        - xvfb
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
     - name: "Linux/GCC/Static"
       os: linux
       dist: focal
diff --git a/tests/all.tcl b/tests/all.tcl
index d15e5ca..3b6b75f 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -14,6 +14,7 @@ package require tcltest 2.2
 tcltest::configure {*}$argv
 tcltest::configure -testdir [file normalize [file dirname [info script]]]
 tcltest::configure -loadfile \
-	[file join [tcltest::testsDirectory] constraints.tcl]
+    [file join [tcltest::testsDirectory] constraints.tcl]
 tcltest::configure -singleproc 1
-tcltest::runAllTests
+set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/tests/bell.test b/tests/bell.test
index 16fea0f..54cad3e 100644
--- a/tests/bell.test
+++ b/tests/bell.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/bgerror.test b/tests/bgerror.test
index fa33d31..b1baa31 100644
--- a/tests/bgerror.test
+++ b/tests/bgerror.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/bind.test b/tests/bind.test
index 96449d1..f857dc0 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 tk useinputmethods 0
@@ -22,7 +22,7 @@ proc setup {} {
     frame .b.f -class Test -width 150 -height 100
     pack .b.f
     focus -force .b.f
-    foreach p [event info] {event delete $p}    
+    foreach p [event info] {event delete $p}
     update
 }
 proc setup2 {} {
@@ -175,7 +175,7 @@ test bind-4.2 {TkBindEventProc procedure} {
     bind .b.f <Enter> {lappend x "%W enter .b.f"}
     bindtags .b.f {.b.f {a b} xyz}
     set x {}
-    event gen .b.f <Enter> 
+    event gen .b.f <Enter>
     set x
 } {{.b.f enter .b.f} {.b.f enter {a b}} {.b.f enter xyz}}
 test bind-4.3 {TkBindEventProc procedure} {
@@ -545,10 +545,10 @@ test bind-13.10 {Tk_BindEvent procedure: collapse Motions} {
     setup
     bind .b.f <Motion> "lappend x Motion%#(%x,%y)"
     set x {}
-    event gen .b.f <Motion> -serial 100 -x 100 -y 200 -when tail 
+    event gen .b.f <Motion> -serial 100 -x 100 -y 200 -when tail
     update
     event gen .b.f <Motion> -serial 101 -x 200 -y 300 -when tail
-    event gen .b.f <Motion> -serial 102 -x 300 -y 400 -when tail 
+    event gen .b.f <Motion> -serial 102 -x 300 -y 400 -when tail
     update
     set x
 } {Motion100(100,200) Motion102(300,400)}
@@ -556,10 +556,10 @@ test bind-13.11 {Tk_BindEvent procedure: collapse repeating modifiers} {
     setup
     bind .b.f <Key> "lappend x %K%#"
     bind .b.f <KeyRelease> "lappend x %K%#"
-    event gen .b.f <Key-Shift_L> -serial 100 -when tail 
-    event gen .b.f <KeyRelease-Shift_L> -serial 101 -when tail 
-    event gen .b.f <Key-Shift_L> -serial 102 -when tail 
-    event gen .b.f <KeyRelease-Shift_L> -serial 103 -when tail 
+    event gen .b.f <Key-Shift_L> -serial 100 -when tail
+    event gen .b.f <KeyRelease-Shift_L> -serial 101 -when tail
+    event gen .b.f <Key-Shift_L> -serial 102 -when tail
+    event gen .b.f <KeyRelease-Shift_L> -serial 103 -when tail
     update
 } {}
 test bind-13.12 {Tk_BindEvent procedure: valid key detail} {
@@ -694,7 +694,7 @@ test bind-13.26 {Tk_BindEvent procedure: no detail virtual pattern list} {
     setup
     bind .b.f <Button-2> {set x Button-2}
     set x {}
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     set x
 } {Button-2}
 test bind-13.27 {Tk_BindEvent procedure: detail virtual pattern list} {
@@ -849,7 +849,7 @@ test bind-13.43 {Tk_BindEvent procedure: break in script} testcbind {
 } {b1}
 
 proc bgerror msg {
-    global x 
+    global x
     lappend x $msg
 }
 test bind-13.44 {Tk_BindEvent procedure: error in script} {
@@ -910,7 +910,7 @@ test bind-14.3 {TkBindDeadWindow: pending C bindings} testcbind {
     }
     set y
 } {a1 b1 d2}
-    
+
 test bind-15.1 {MatchPatterns procedure, ignoring type mismatches} {
     setup
     bind .b.f ab {set x 1}
@@ -1037,7 +1037,7 @@ test bind-15.14 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 31 -y 39
@@ -1048,7 +1048,7 @@ test bind-15.15 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 29 -y 41
@@ -1059,7 +1059,7 @@ test bind-15.16 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 40 -y 40
@@ -1070,7 +1070,7 @@ test bind-15.17 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 20 -y 40
@@ -1081,7 +1081,7 @@ test bind-15.18 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 30 -y 30
@@ -1092,7 +1092,7 @@ test bind-15.19 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 30 -y 50
@@ -1103,7 +1103,7 @@ test bind-15.20 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -time 300
     event gen .b.f <Button-1> -time 700
@@ -1114,7 +1114,7 @@ test bind-15.21 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -time 300
     event gen .b.f <Button-1> -time 900
@@ -1700,7 +1700,7 @@ test bind-18.3 {CreateVirtualEvent procedure: new physical} {
 } {<Control-Key-v>}
 test bind-18.4 {CreateVirtualEvent procedure: duplicate physical} {
     setup
-    event add <<xyz>> <Control-v> 
+    event add <<xyz>> <Control-v>
     event add <<xyz>> <Control-v>
     event info <<xyz>>
 } {<Control-Key-v>}
@@ -1757,13 +1757,13 @@ test bind-19.7 {DeleteVirtualEvent procedure: owns 1, delete all} {
     setup
     event add <<xyz>> <Control-v>
     event delete <<xyz>>
-    event info 
+    event info
 } {}
 test bind-19.8 {DeleteVirtualEvent procedure: owns 1, delete 1} {
     setup
     event add <<xyz>> <Control-v>
     event delete <<xyz>> <Control-v>
-    event info 
+    event info
 } {}
 test bind-19.9 {DeleteVirtualEvent procedure: owns many, delete all} {
     setup
@@ -1800,7 +1800,7 @@ test bind-19.12 {DeleteVirtualEvent procedure: owned by 1, first in chain} {
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
     event gen .b.f <Control-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
@@ -1846,7 +1846,7 @@ test bind-19.14 {DeleteVirtualEvent procedure: owned by 1, last in chain} {
     event gen .b.f <Control-ButtonRelease-2>
     event gen .b.f <Shift-Button-2>
     event gen .b.f <Shift-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
@@ -1873,7 +1873,7 @@ test bind-19.15 {DeleteVirtualEvent procedure: owned by many, first} {
     event gen .b.g <ButtonRelease-2>
     event gen .b.h <Button-2>
     event gen .b.h <ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.g <Button-2>
@@ -1931,7 +1931,7 @@ test bind-19.17 {DeleteVirtualEvent procedure: owned by many, last} {
     event gen .b.g <ButtonRelease-2>
     event gen .b.h <Button-2>
     event gen .b.h <ButtonRelease-2>
-    event delete <<def>> 
+    event delete <<def>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.g <Button-2>
@@ -2100,7 +2100,7 @@ foreach check {
     {bind-22.22 <Configure> %a {-above [winfo id .b]} {[winfo id .b]}}
     {bind-22.23 <Key> %b       {-above .} {{1 {<Key> event doesn't accept "-above" option}}}}
 
-    {bind-22.24 <Configure> %B {-borderwidth xyz} {{1 {bad screen distance "xyz"}}}}    
+    {bind-22.24 <Configure> %B {-borderwidth xyz} {{1 {bad screen distance "xyz"}}}}
     {bind-22.25 <Configure> %B {-borderwidth 2i} {[winfo pixels .b.f 2i]}}
     {bind-22.26 <Key> %k       {-borderwidth 2i} {{1 {<Key> event doesn't accept "-borderwidth" option}}}}
 
@@ -2536,7 +2536,7 @@ test bind-26.3 {event names} {
     destroy .b.f
     set x
 } {<Destroy> destroyed}
-foreach check { 
+foreach check {
     {bind-26.4  Motion     Motion}
     {bind-26.5  Button     Button}
     {bind-26.6  ButtonPress   Button}
@@ -2563,7 +2563,7 @@ foreach check {
     } [list "event $event" <$canonicalEvent>]
 }
 # These events require an extra argument to [event generate]
-foreach check { 
+foreach check {
     {bind-26.19 Circulate Circulate}
     {bind-26.20 Configure Configure}
     {bind-26.21 Gravity   Gravity}
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 6e2255c..05086c3 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/border.test b/tests/border.test
index 30aed91..5b2155d 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/button.test b/tests/button.test
index 927aac0..fc8040d 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -804,7 +804,7 @@ test button-14.1 {size behaviouor} {
     foreach class {label button radiobutton checkbutton} {
 	eval destroy [winfo children .]
 
-	$class .a -text Hej 
+	$class .a -text Hej
 	$class .b -text Hej -width 10 -height 1
 	$class .c -text "" -width 10 -height 1
 
@@ -817,7 +817,7 @@ test button-14.1 {size behaviouor} {
 	    # A one line text should be as high as -height 1
 	    lappend res2 [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 	    lappend res $res2
-	    
+
 	    # Do the second round with another font
 	    .a configure -font "Arial 20"
 	    .b configure -font "Arial 20"
diff --git a/tests/canvImg.test b/tests/canvImg.test
index 1dffc5e..92ec6a8 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvPs.test b/tests/canvPs.test
index f2df447..f605f2f 100644
--- a/tests/canvPs.test
+++ b/tests/canvPs.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvRect.test b/tests/canvRect.test
index b6c828e..b36cf21 100644
--- a/tests/canvRect.test
+++ b/tests/canvRect.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -292,7 +292,7 @@ test canvRect-10.1 {TranslateRectOval procedure} {
 test canvRect-11.1 {RectOvalToPostscript procedure} {nonPortable macCrash} {
     # Crashes on Mac because the XGetImage() call isn't implemented, causing a
     # dereference of NULL.
-    
+
     .c configure -bd 0 -highlightthickness 0
     .c delete withtag all
     .c create rect 50 60 90 80 -fill black -stipple gray50 -outline {}
diff --git a/tests/canvText.test b/tests/canvText.test
index 7eef938..7608f86 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvWind.test b/tests/canvWind.test
index 9844ff0..65b7b76 100644
--- a/tests/canvWind.test
+++ b/tests/canvWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvas.test b/tests/canvas.test
index 6fea894..ac9ed4e 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -251,7 +251,7 @@ test canvas-9.1 {canvas id creation and deletion} -setup {
 	    .c delete $id
 	}
     }] 0]
-	
+
     set x ""
 } -result {}
 test canvas-10.1 {find items using tag expressions} -setup {
@@ -416,10 +416,10 @@ test canvas-12.1 {canvas mm obj, patch SF-403327, 102471} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
-    set qx [expr {1.+1.}] 
-    # qx has type double and no string representation 
+    set qx [expr {1.+1.}]
+    # qx has type double and no string representation
     .c scale all $qx 0 1. 1.
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     list $qx [string length $qx]
 } -result {2.0 3}
 test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {
@@ -428,9 +428,9 @@ test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {
 } -body {
     set val 10
     incr val
-    # qx has type double and no string representation 
+    # qx has type double and no string representation
     .c scale all $val 0 1 1
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     incr val
 } -result 12
 
diff --git a/tests/choosedir.test b/tests/choosedir.test
index 01a319f..05d3675 100644
--- a/tests/choosedir.test
+++ b/tests/choosedir.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/clipboard.test b/tests/clipboard.test
index 37e45a3..f8d6b1f 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -11,7 +11,7 @@
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/clrpick.test b/tests/clrpick.test
index 8b3769e..2fa8c36 100644
--- a/tests/clrpick.test
+++ b/tests/clrpick.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/cmds.test b/tests/cmds.test
index f630209..84e24b3 100644
--- a/tests/cmds.test
+++ b/tests/cmds.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/color.test b/tests/color.test
index aa20099..c65d6ee 100644
--- a/tests/color.test
+++ b/tests/color.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -168,7 +168,7 @@ test color-1.5 {Color table} nonPortable {
 	if {$rgb != [lrange $line 0 2] } {
 		append result $line\n
 	}
-	
+
     }
     return $result
 } {}
diff --git a/tests/config.test b/tests/config.test
index 0d1e0e1..bf00e20 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 01089aa..78dbaf2 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -5,7 +5,7 @@ if {[namespace exists tk::test]} {
     return
 }
 
-package require Tk 8.4
+package require Tk
 tk appname tktest
 wm title . tktest
 # If the main window isn't already mapped (e.g. because the tests are
@@ -17,7 +17,7 @@ if {![winfo ismapped .]} {
     update
 }
 
-package require tcltest 2.1
+package require tcltest 2.2
 
 namespace eval tk {
     namespace eval test {
@@ -36,7 +36,7 @@ namespace eval tk {
 	}
 
 	namespace eval bg {
-	    # Manage a background process.  
+	    # Manage a background process.
 	    # Replace with slave interp or thread?
 	    namespace import ::tcltest::interpreter
 	    namespace import ::tk::test::loadTkCommand
@@ -124,7 +124,7 @@ namespace eval tk {
 	    eval destroy [winfo children .]
 	}
 
-	namespace export fixfocus 
+	namespace export fixfocus
 	proc fixfocus {} {
             catch {destroy .focus}
             toplevel .focus
@@ -144,13 +144,14 @@ namespace import -force tk::test::*
 namespace import -force tcltest::testConstraint
 testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}]
 testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}]
+testConstraint x11 [expr {[tk windowingsystem] eq "x11"}]
 testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}]
 testConstraint userInteraction 0
 testConstraint nonUnixUserInteraction [expr {
-    [testConstraint userInteraction] || 
+    [testConstraint userInteraction] ||
     ([testConstraint unix] && [testConstraint notAqua])
 }]
-testConstraint haveDISPLAY [info exists env(DISPLAY)]
+testConstraint haveDISPLAY [expr {[info exists env(DISPLAY)] && [testConstraint x11]}]
 testConstraint altDisplay  [info exists env(TK_ALT_DISPLAY)]
 testConstraint noExceed [expr {
     ![testConstraint unix] || [catch {font actual "\{xyz"}]
@@ -169,7 +170,6 @@ testConstraint testembed     [llength [info commands testembed]]
 testConstraint testfont      [llength [info commands testfont]]
 testConstraint testmakeexist [llength [info commands testmakeexist]]
 testConstraint testmenubar   [llength [info commands testmenubar]]
-testConstraint testmenubar   [llength [info commands testmenubar]]
 testConstraint testmetrics   [llength [info commands testmetrics]]
 testConstraint testobjconfig [llength [info commands testobjconfig]]
 testConstraint testsend      [llength [info commands testsend]]
diff --git a/tests/cursor.test b/tests/cursor.test
index 539e933..02ad78c 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/dialog.test b/tests/dialog.test
index 538461b..8a21d59 100644
--- a/tests/dialog.test
+++ b/tests/dialog.test
@@ -1,7 +1,7 @@
 # This file is a Tcl script to test out Tk's "tk_dialog" command.
 # It is organized in the standard fashion for Tcl tests.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/embed.test b/tests/embed.test
index bac2675..865b594 100644
--- a/tests/embed.test
+++ b/tests/embed.test
@@ -4,7 +4,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/entry.test b/tests/entry.test
index da3637d..2e828cf 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -44,9 +44,9 @@ foreach test {
     {-bg #ff0000 #ff0000 non-existent {unknown color name "non-existent"}}
     {-borderwidth 1.3 1 badValue {bad screen distance "badValue"}}
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
-    {-disabledbackground green green non-existent 
+    {-disabledbackground green green non-existent
 	{unknown color name "non-existent"}}
-    {-disabledforeground blue blue non-existent 
+    {-disabledforeground blue blue non-existent
 	{unknown color name "non-existent"}}
     {-exportselection yes 1 xyzzy {expected boolean value but got "xyzzy"}}
     {-fg #110022 #110022 bogus {unknown color name "bogus"}}
@@ -65,14 +65,14 @@ foreach test {
     {-invalidcommand "any string" "any string" {} {}}
     {-invcmd "any string" "any string" {} {}}
     {-justify right right bogus {bad justification "bogus": must be left, right, or center}}
-    {-readonlybackground green green non-existent 
+    {-readonlybackground green green non-existent
 	{unknown color name "non-existent"}}
     {-relief groove groove 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
     {-selectbackground #110022 #110022 bogus {unknown color name "bogus"}}
     {-selectborderwidth 1.3 1 badValue {bad screen distance "badValue"}}
     {-selectforeground #654321 #654321 bogus {unknown color name "bogus"}}
     {-show * * {} {}}
-    {-state n normal bogus 
+    {-state n normal bogus
 	{bad state "bogus": must be disabled, normal, or readonly}}
     {-takefocus "any string" "any string" {} {}}
     {-textvariable i i {} {}}
@@ -506,13 +506,13 @@ test entry-3.74 {EntryWidgetCmd procedure, "xview" widget command} {
 test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } {32}
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } {29}
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} {
@@ -1202,14 +1202,14 @@ test entry-13.9 {GetEntryIndex procedure} {
 } {1 6}
 selection clear .e
 test entry-13.10 {GetEntryIndex procedure} unix {
-    # On unix, when selection is cleared, entry widget's internal 
+    # On unix, when selection is cleared, entry widget's internal
     # selection range is reset.
 
     list [catch {.e index sel.first} msg] $msg
 } {1 {selection isn't in widget .e}}
 test entry-13.11 {GetEntryIndex procedure} win {
     # On mac and pc, when selection is cleared, entry widget remembers
-    # last selected range.  When selection ownership is restored to 
+    # last selected range.  When selection ownership is restored to
     # entry, the old range will be rehighlighted.
 
     list [catch {selection get}] [.e index sel.first]
@@ -1388,7 +1388,7 @@ test entry-18.1 {Entry widget vs hiding} {
     interp hide {} .e
     destroy .e
     list [winfo children .] [interp hidden]
-} [list {} $l]    
+} [list {} $l]
 
 ##
 ## Entry widget VALIDATION tests
diff --git a/tests/event.test b/tests/event.test
index 95be5f4..4fb2429 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -326,7 +326,7 @@ test event-3.1(click-drag) {click and drag in a text widget, this tests\
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
@@ -390,7 +390,7 @@ test event-3.2(click-drag) {click and drag in an entry widget, this\
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
@@ -743,7 +743,7 @@ test event-7.2(double-click) {A double click on a lone character\
     set result [list]
     lappend result [$e index insert]
     lappend result [_get_selection $e]
-  
+
     # Clear selection by clicking at 0,0
 
     event generate $e <ButtonPress-1> -x 0 -y 0
diff --git a/tests/filebox.test b/tests/filebox.test
index 7b9fa2c..5addcf0 100644
--- a/tests/filebox.test
+++ b/tests/filebox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -162,7 +162,7 @@ foreach mode $modes {
     catch {tk_getOpenFile -foo 1} msg
     regsub -all ,      $msg "" options
     regsub \"-foo\" $options "" options
-    
+
     foreach option $options {
         if {[string index $option 0] eq "-"} {
 	    test filebox-1.2-$mode$option "tk_getOpenFile command" -body {
diff --git a/tests/focus.test b/tests/focus.test
index 5cc3abe..eee0ee6 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/focusTcl.test b/tests/focusTcl.test
index 1f5eed5..1812a38 100644
--- a/tests/focusTcl.test
+++ b/tests/focusTcl.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/font.test b/tests/font.test
index 2defb29..6175b32 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -37,14 +37,14 @@ proc clearnondefaultfonts {} {
 proc setup {} {
     catch {destroy .b.f}
     clearnondefaultfonts
-    label .b.f 
+    label .b.f
     pack .b.f
     update
 }
 
 label .b.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left -text "0" -font "Courier -12"
 pack .b.l
-canvas .b.c -closeenough 0 
+canvas .b.c -closeenough 0
 .b.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .b.c
 update
@@ -104,7 +104,7 @@ test font-2.1 {TkFontPkgFree} {
 
     # Tests cancelling the idle handler for TheWorldHasChanged,
     # because app goes away before idle serviced.
-    
+
     foo eval {
 	.b config -font wiggles
 	font config wiggles -size 24
@@ -129,7 +129,7 @@ test font-4.1 {font command: actual: arguments} {
     list [catch {font actual xyz -displayof} msg] $msg
 } {1 {value for "-displayof" missing}}
 test font-4.2 {font command: actual: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font actual} msg] $msg
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
 test font-4.3 {font command: actual: arguments} {
@@ -167,7 +167,7 @@ test font-4.11 {font command: bad option} {
 } {1 {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 
 test font-5.1 {font command: configure} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font configure} msg] $msg
 } {1 {wrong # args: should be "font configure fontname ?options?"}}
 test font-5.2 {font command: configure: non-existent font} {
@@ -175,7 +175,7 @@ test font-5.2 {font command: configure: non-existent font} {
     list [catch {font configure xyz} msg] $msg
 } {1 {named font "xyz" doesn't exist}}
 test font-5.3 {font command: configure: "deleted" font} {
-    # (nfPtr->deletePending != 0) 
+    # (nfPtr->deletePending != 0)
     setup
     font create xyz
     .b.f configure -font xyz
@@ -237,12 +237,12 @@ test font-6.4 {font command: create: generate name} {
     font configure font2 -family
 } {four}
 test font-6.5 {font command: create: bad option creating new font} {
-    # name was specified so skip = 3 
+    # name was specified so skip = 3
     setup
     list [catch {font create xyz -xyz times} msg] $msg
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 test font-6.6 {font command: create: bad option creating new font} {
-    # name was not specified so skip = 2 
+    # name was not specified so skip = 2
     setup
     list [catch {font create -xyz times} msg] $msg
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
@@ -254,11 +254,11 @@ test font-6.7 {font command: create: already exists} {
 } {1 {named font "xyz" already exists}}
 
 test font-7.1 {font command: delete: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font delete} msg] $msg
 } {1 {wrong # args: should be "font delete fontname ?fontname ...?"}}
 test font-7.2 {font command: delete: loop test} {
-    # for (i = 2; i < objc; i++) 
+    # for (i = 2; i < objc; i++)
     setup
     set x {}
     font create a -underline 1
@@ -284,7 +284,7 @@ test font-7.3 {font command: delete: loop test} {
     lappend x [lsort [getnondefaultfonts]]
 } {{a b c d e} {b c e}}
 test font-7.4 {font command: delete: non-existent} {
-    # (namedHashPtr == NULL) 
+    # (namedHashPtr == NULL)
     setup
     list [catch {font delete xyz} msg] $msg
 } {1 {named font "xyz" doesn't exist}}
@@ -328,11 +328,11 @@ test font-9.1 {font command: measure: arguments} {
     list [catch {expr {[font measure xyz -displayof]>0}} msg] $msg
 } {0 1}
 test font-9.2 {font command: measure: arguments} {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     list [catch {font measure} msg] $msg
 } {1 {wrong # args: should be "font measure font ?-displayof window? text"}}
 test font-9.3 {font command: measure: arguments} {
-    # (objc - skip != 4) 
+    # (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} {
@@ -361,7 +361,7 @@ test font-10.2 {font command: metrics: arguments} {
     list [catch {font metrics xyz -displayof} msg] $msg
 } {1 {value for "-displayof" missing}}
 test font-10.3 {font command: metrics: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font metrics} msg] $msg
 } {1 {wrong # args: should be "font metrics font ?-displayof window? ?option?"}}
 test font-10.4 {font command: metrics: arguments} {
@@ -382,7 +382,7 @@ test font-10.7 {font command: metrics: get all metrics} {
     array set a [font metrics {-family xyz}]
     set x [lsort [array names a]]
     unset a
-    set x    
+    set x
 } {-ascent -descent -fixed -linespace}
 test font-10.8 {font command: metrics: bad metric} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
@@ -515,10 +515,10 @@ test font-15.4 {Tk_AllocFontFromObj procedure: bump ref count} {
     lindex [font actual {-family fixed}] 0
 } {-family}
 test font-15.5 {Tk_AllocFontFromObj procedure: get named font} {
-    # (namedHashPtr != NULL) 
+    # (namedHashPtr != NULL)
     setup
-    font create xyz 
-    .b.f config -font xyz 
+    font create xyz
+    .b.f config -font xyz
 } {}
 test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} {
     # not (namedHashPtr != NULL)
@@ -526,17 +526,17 @@ test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} {
     .b.f config -font {times 20}
 } {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} unix {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     setup
     .b.f config -font fixed
 } {}
 test font-15.8 {Tk_AllocFontFromObj procedure: get native font} win {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     setup
     .b.f config -font oemfixed
 } {}
 test font-15.10 {Tk_AllocFontFromObj procedure: get attribute font} {
-    # (fontPtr == NULL) 
+    # (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} {
@@ -560,7 +560,7 @@ test font-15.14 {Tk_AllocFontFromObj procedure: underline position} {
     setup
     .b.f config -text "underline" -font "times -8 underline"
     update
-} {}    
+} {}
 
 test font-16.1 {Tk_NameOfFont procedure} {
     setup
@@ -600,7 +600,7 @@ test font-17.3 {Tk_FreeFont procedure: multiple ref} {
     set x
 } {-family fixed}
 test font-17.4 {Tk_FreeFont procedure: named font} {
-    # (fontPtr->namedHashPtr != NULL) 
+    # (fontPtr->namedHashPtr != NULL)
     setup
     font create xyz
     .b.f config -font xyz
@@ -608,7 +608,7 @@ test font-17.4 {Tk_FreeFont procedure: named font} {
     expr {"xyz" in [font names]}
 } {1}
 test font-17.5 {Tk_FreeFont procedure: named font} {
-    # not (fontPtr->refCount == 0) 
+    # not (fontPtr->refCount == 0)
     setup
     font create xyz -underline 1
     .b.f config -font xyz
@@ -619,7 +619,7 @@ test font-17.5 {Tk_FreeFont procedure: named font} {
 } {0 1}
 test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} {
     setup
-    font create xyz 
+    font create xyz
     .b.f config -font xyz
     button .b.b -font xyz
     font delete xyz
@@ -873,7 +873,7 @@ test font-25.1 {Tk_FreeTextLayout procedure} {
     .b.f config -text foo
     .b.f config -text boo
 } {}
-    
+
 test font-26.1 {Tk_DrawTextLayout procedure: auto-detect last char} {
     .b.f config -text foo
 } {}
@@ -908,7 +908,7 @@ test font-27.3 {Tk_UnderlineTextLayout procedure: underline is visible} {
     .b.f config -text "000          00000" -wrap [expr $ax*7] -under 5
     .b.f config -wrap -1 -under -1
 } {}
-    
+
 test font-28.1 {Tk_PointToChar procedure: above all lines} {
     csetup "000"
     .b.c index text @-1,0
@@ -962,7 +962,7 @@ test font-28.11 {Tk_PointToChar procedure: below all chunks} {
     csetup "000 0000000"
     .b.c index text @0,1000000
 } {11}
-    
+
 test font-29.1 {Tk_CharBBox procedure: index < 0} {
     .b.f config -text "000" -underline -1
 } {}
@@ -1113,14 +1113,14 @@ test font-31.6 {Tk_IntersectTextLayout procedure: ignore spaces at eol} {
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
-    
+
     csetup "qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm\n"
     .b.c itemconfig text -width 800
     .b.c insert text end "qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm\n"
     .b.c insert text end "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     .b.c insert text end "end"
     set x [.b.c postscript]
-    set i [string first "(qwerty" $x] 
+    set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
@@ -1219,7 +1219,7 @@ test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} {
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 
 test font-37.1 {GetAttributeInfoObj procedure: all attributes} {
-    # not (objPtr != NULL) 
+    # not (objPtr != NULL)
     setup
     font create xyz -family xyz
     font config xyz
diff --git a/tests/frame.test b/tests/frame.test
index affdac6..9bb3377 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -420,7 +420,7 @@ test frame-3.17 {TkCreateFrame procedure} {defaultPseudocolor8 nonPortable} {
 } {1}
 test frame-3.18 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 nonPortable} {
     catch {destroy .t}
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
@@ -449,7 +449,7 @@ test frame-3.20 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 no
 test frame-3.21 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 nonPortable} {
     catch {destroy .t}
     set x ok
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
@@ -692,7 +692,7 @@ test frame-12.2 {FrameWorldChanged procedure} {
     place .f -x 0 -y 0 -width 100 -height 100
     pack [frame .f.f] -fill both -expand 1
 
-    set result {} 
+    set result {}
     foreach lp {nw n ne en e es se s sw ws w wn} {
         .f configure -labelanchor $lp
         update
diff --git a/tests/geometry.test b/tests/geometry.test
index 04ab578..b5b6c77 100644
--- a/tests/geometry.test
+++ b/tests/geometry.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -229,7 +229,7 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} {
     wm geometry .t +0+0
     tkwait visibility .t
     update
-    frame .t.f 
+    frame .t.f
     pack .t.f
     button .t.quit -text Quit -command exit
     pack .t.quit -in .t.f
diff --git a/tests/get.test b/tests/get.test
index d3a4228..89b41d4 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/grab.test b/tests/grab.test
index 2f4f73b..1301776 100644
--- a/tests/grab.test
+++ b/tests/grab.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/grid.test b/tests/grid.test
index fee81b5..1b9b54e 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -559,7 +559,7 @@ test grid-9.11 {slaves} {
 	lappend a $col{[grid slaves . -column $col]}
     }
     set a
-} {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}} 
+} {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}}
 grid_reset 9.11
 
 # column/row configure
@@ -1026,7 +1026,7 @@ test grid-11.16 {default widget placement} {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
-    grid .a .b .c .d -sticky news 
+    grid .a .b .c .d -sticky news
     grid  x  ^  x .e -sticky news
     update
     set res ""
@@ -1119,13 +1119,13 @@ test grid-12.1 {-sticky} {
 (nesw) 0 0 250 150
 }
 grid_reset 12.1
-   
+
 test grid-12.2 {-sticky} {
     frame .f -bg red
     list [catch "grid .f -sticky glue" msg] $msg
 } {1 {bad stickyness value "glue": must be a string containing n, e, s, and/or w}}
 grid_reset 12.2
-   
+
 test grid-12.3 {-sticky} {
     frame .f -bg red
     grid .f -sticky {n,s,e,w}
@@ -1315,8 +1315,8 @@ grid_reset 13.13
 test grid-14.1 {structure notify} {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     frame .g -width 200 -height 100 -highlightthickness 0 -bg red
-    grid .f 
-    grid .g -in .f    
+    grid .f
+    grid .g -in .f
     update
     set a ""
     lappend a "[winfo x .g],[winfo y .g] \
@@ -1330,9 +1330,9 @@ test grid-14.1 {structure notify} {
 grid_reset 14.1
 
 test grid-14.2 {structure notify} {
-    frame .f -width 200 -height 100 
-    frame .f.g -width 200 -height 100 
-    grid .f 
+    frame .f -width 200 -height 100
+    frame .f.g -width 200 -height 100
+    grid .f
     grid .f.g
     update
     set a ""
diff --git a/tests/id.test b/tests/id.test
index de0d965..8ee55bf 100644
--- a/tests/id.test
+++ b/tests/id.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/image.test b/tests/image.test
index c6c4f8a..813ff8a 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force ::tk::test::loadTkCommand
@@ -221,7 +221,7 @@ test image-8.1 {Tk_ImageCmd procedure, "inuse" option} testImageType {
     image delete myimage2
     set res
 } [list 0 1]
-    
+
 
 test image-9.1 {Tk_ImageChanged procedure} testImageType {
     .c delete all
@@ -430,7 +430,7 @@ test image-15.1 {deleting image does not make widgets forget about it} {
     image create photo foo -width 20 -height 20
     lappend x [.c bbox i1] [image names]
 } {10 10 20 20 foo {} {10 10 30 30} foo}
-    
+
 destroy .c
 eval image delete [image names]
 
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index edbb8c3..17cbce5 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/imgPPM.test b/tests/imgPPM.test
index 8dec8c2..c9acaec 100644
--- a/tests/imgPPM.test
+++ b/tests/imgPPM.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 2b5f7ec..eda0c13 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -9,7 +9,7 @@
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -456,7 +456,7 @@ test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
     image delete photo1
 } -returnCodes 1 -result {wrong # args: should be "photo1 put data ?options?"}
 test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -body {
     file copy -force $teapotPhotoFile -teapotPhotoFile
     image create photo photo1
@@ -712,7 +712,7 @@ test imgPhoto-14.4 {GIF buffer overflow} -setup {
 	mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////
 	AP//M///Zv//mf//zP///yH5BAEAABAALAAAAAAKAAoAABUSAAD/HEiwoMGD
 	CBMqXMiwYcKAADs=
-    } 
+    }
 } -cleanup {
     image delete $i
 } -returnCodes error -result {malformed image}
diff --git a/tests/listbox.test b/tests/listbox.test
index 62b8cc1..f3dfd76 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -888,7 +888,7 @@ test listbox-4.12 {ConfigureListbox procedure, listvar -> different listvar} {
     catch {destroy .l}
     set x [list a b c d]
     set y [list 1 2 3 4]
-    listbox .l 
+    listbox .l
     .l configure -listvar x
     .l configure -listvar y
     .l insert end 5 6 7 8
@@ -994,7 +994,7 @@ test listbox-5.6 {ListboxComputeGeometry procedure} {
     pack [listbox .l -font {{open look glyph}}]
     update
 } {}
-    
+
 
 catch {destroy .l}
 listbox .l -height 2 -xscrollcommand "record x" -yscrollcommand "record y"
@@ -2067,7 +2067,7 @@ test listbox-25.2 {listbox item configurations and widget based inserts} {
     .l insert 0 1 2 3 4
     list [.l itemcget 0 -fg] [.l itemcget 4 -fg]
 } [list {} red]
-    
+
 # state issues
 test listbox-26.1 {listbox disabled state disallows inserts} {
     catch {destroy .l}
diff --git a/tests/main.test b/tests/main.test
index 1d33fbb..e63c5e1 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/menu.test b/tests/menu.test
index c797281..635e22f 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -151,7 +151,7 @@ foreach configTest {
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
     {-disabledforeground #00ff00 #00ff00 xyzzy {unknown color name "xyzzy"}}
     {-fg #110022 #110022 bogus {unknown color name "bogus"}}
-    {-font -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
+    {-font -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* {}
 	    {font "" doesn't exist}}
     {-foreground #110022 #110022 bogus {unknown color name "bogus"}}
@@ -186,7 +186,7 @@ destroy .m1
 # We need to test all of the options with all of the different types of
 # menu entries. The following code sets up .m1 with 6 items. It then
 # runs through the big table below it.
-# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton, 
+# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
 # 5 radiobutton
 
 menu .m1
@@ -202,14 +202,14 @@ if {[testConstraint hasEarthPhoto]} {
 }
 
 foreach configTest {
-    {-activebackground 
-        {{#012345 
-            {{unknown option "-activebackground"} #012345 #012345 
+    {-activebackground
+        {{#012345
+            {{unknown option "-activebackground"} #012345 #012345
             {unknown option "-activebackground"} #012345 #012345
             }
         }
-        {non-existent 
-            {{unknown option "-activebackground"} 
+        {non-existent
+            {{unknown option "-activebackground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-activebackground"}
@@ -219,13 +219,13 @@ foreach configTest {
 	}}
     }
     {-activeforeground
-    	{{#ff0000 
+    	{{#ff0000
 	    {{unknown option "-activeforeground"}
 	    #ff0000 #ff0000 {unknown option "-activeforeground"} #ff0000 #ff0000
 	    }
 	}
 	{non-existent
-	    {{unknown option "-activeforeground"} 
+	    {{unknown option "-activeforeground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-activeforeground"}
@@ -235,20 +235,20 @@ foreach configTest {
 	}}
     }
     {-accelerator
-    	{{"Ctrl+S" 
+    	{{"Ctrl+S"
 	    {{unknown option "-accelerator"}
-	    "Ctrl+S" "Ctrl+S" {unknown option "-accelerator"} 
+	    "Ctrl+S" "Ctrl+S" {unknown option "-accelerator"}
 	    "Ctrl+S" "Ctrl+S"
 	    }
 	}}
     }
     {-background
-    	{{#ff0000 
+    	{{#ff0000
     	    {#ff0000 #ff0000 #ff0000 #ff0000 #ff0000 #ff0000
 	    }
 	}
 	{non-existent
-	    {{unknown color name "non-existent"} 
+	    {{unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
@@ -258,13 +258,13 @@ foreach configTest {
 	}}
     }
     {-bitmap
-    	{{questhead 
-	    {{unknown option "-bitmap"} questhead questhead 
+    	{{questhead
+	    {{unknown option "-bitmap"} questhead questhead
 	    {unknown option "-bitmap"} questhead questhead
 	    }
 	}
 	{badValue
-	    {{unknown option "-bitmap"} 
+	    {{unknown option "-bitmap"}
 	    {bitmap "badValue" not defined}
 	    {bitmap "badValue" not defined}
 	    {unknown option "-bitmap"}
@@ -275,23 +275,23 @@ foreach configTest {
     }
     {-columnbreak
 	{{1
-	    {{unknown option "-columnbreak"} 1 1 
+	    {{unknown option "-columnbreak"} 1 1
 	    {unknown option "-columnbreak"} 1 1}
 	}}
     }
     {-command
-    	{{beep 
-	    {{unknown option "-command"} beep beep 
+    	{{beep
+	    {{unknown option "-command"} beep beep
 	    {unknown option "-command"} beep beep
 	    }
 	}}
     }
     {-font
-    	{{-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
+    	{{-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    {{unknown option "-font"}
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
-    	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
-	    {unknown option "-font"} 
+    	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
+	    {unknown option "-font"}
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    }
@@ -307,13 +307,13 @@ foreach configTest {
 	}}
     }
     {-foreground
-    	{{#110022 
-	    {{unknown option "-foreground"} #110022 #110022 
+    	{{#110022
+	    {{unknown option "-foreground"} #110022 #110022
 	    {unknown option "-foreground"} #110022 #110022
 	    }
 	}
 	{non-existent
-	    {{unknown option "-foreground"} 
+	    {{unknown option "-foreground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-foreground"}
@@ -323,13 +323,13 @@ foreach configTest {
 	}}
     }
     {-image
-    	{{image1 
-	    {{unknown option "-image"} image1 image1 
+    	{{image1
+	    {{unknown option "-image"} image1 image1
 	    {unknown option "-image"} image1 image1
 	    }
 	}
 	{bogus
-	    {{unknown option "-image"} 
+	    {{unknown option "-image"}
 	    {image "bogus" doesn't exist}
 	    {image "bogus" doesn't exist}
 	    {unknown option "-image"}
@@ -348,25 +348,25 @@ foreach configTest {
 	}}
     }
     {-indicatoron
-    	{{1 
+    	{{1
 	    {{unknown option "-indicatoron"}
 	    {unknown option "-indicatoron"}
-	    {unknown option "-indicatoron"} 
+	    {unknown option "-indicatoron"}
 	    {unknown option "-indicatoron"} 1 1
 	    }
 	}}
     }
     {-label
-    	{{test 
-	    {{unknown option "-label"} test test 
+    	{{test
+	    {{unknown option "-label"} test test
 	    {unknown option "-label"} test test
 	    }
 	}}
     }
     {-menu
-    	{{.m2 
+    	{{.m2
 	    {{unknown option "-menu"}
-	    {unknown option "-menu"} .m2 
+	    {unknown option "-menu"} .m2
 	    {unknown option "-menu"}
 	    {unknown option "-menu"}
 	    {unknown option "-menu"}
@@ -375,7 +375,7 @@ foreach configTest {
     }
     {-offvalue
     	{{off
-	    {{unknown option "-offvalue"} 
+	    {{unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
@@ -390,23 +390,23 @@ foreach configTest {
 	    {unknown option "-onvalue"}
 	    {unknown option "-onvalue"}
 	    {unknown option "-onvalue"}
-    	    on 
+    	    on
 	    {unknown option "-onvalue"}
 	    }
 	}}
     }
     {-selectcolor
-    	{{#110022 
-	    {{unknown option "-selectcolor"} 
+    	{{#110022
+	    {{unknown option "-selectcolor"}
+	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
-	    {unknown option "-selectcolor"} 
 	    {unknown option "-selectcolor"}
     	    #110022
     	    #110022
 	    }
 	}
 	{non-existent
-	    {{unknown option "-selectcolor"} 
+	    {{unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
@@ -416,15 +416,15 @@ foreach configTest {
 	}}
     }
     {-selectimage
-    	{{image1 
+    	{{image1
     	    {{unknown option "-selectimage"}
     	    {unknown option "-selectimage"}
-    	    {unknown option "-selectimage"} 
+    	    {unknown option "-selectimage"}
     	    {unknown option "-selectimage"} image1 image1
 	    }
 	}
 	{bogus
-	    {{unknown option "-selectimage"} 
+	    {{unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
@@ -443,7 +443,7 @@ foreach configTest {
 	}}
     }
     {-state
-    	{{normal 
+    	{{normal
     	    {normal normal normal {unknown option "-state"} normal normal
 	    }
 	}}
@@ -462,7 +462,7 @@ foreach configTest {
     	{{"any string"
     	    {{unknown option "-variable"}
     	    {unknown option "-variable"}
-    	    {unknown option "-variable"} 
+    	    {unknown option "-variable"}
     	    {unknown option "-variable"}
     	    "any string"
     	    "any string"
@@ -470,13 +470,13 @@ foreach configTest {
 	}}
     }
     {-underline
-    	{{0 
-    	    {{unknown option "-underline"} 0 0 
+    	{{0
+    	    {{unknown option "-underline"} 0 0
     	    {unknown option "-underline"} 0 0
 	    }
 	}
 	{3p
-	    {{unknown option "-underline"} 
+	    {{unknown option "-underline"}
 	    {expected integer but got "3p"}
 	    {expected integer but got "3p"}
 	    {unknown option "-underline"}
@@ -651,7 +651,7 @@ test menu-3.26 {MenuWidgetCmd procedure, "delete" option} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "foo"
-    list [catch {.m1 delete 1 0} msg] $msg [destroy .m1] 
+    list [catch {.m1 delete 1 0} msg] $msg [destroy .m1]
 } {0 {} {}}
 test menu-3.27 {MenuWidgetCmd procedure, "delete" option} {
     catch {destroy .m1}
@@ -894,7 +894,7 @@ test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} {nonUnixUserInteractio
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "menu-3.68 - hit Escape"
-    .m1 post 40 40 
+    .m1 post 40 40
     list [catch {.m1 unpost} msg] $msg [destroy .m1]
 } {0 {} {}}
 test menu-3.65 {MenuWidgetCmd procedure, "yposition" option} {
@@ -981,7 +981,7 @@ test menu-4.5 {TkInvokeMenu: checkbutton array element} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1
-    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on 
+    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on
     list [catch {.m1 invoke 1} msg] $msg [catch {set foo(1)} msg2] $msg2 [catch {unset foo} msg3] $msg3 [destroy .m1]
 } {0 {} 0 on 0 {} {}}
 test menu-4.6 {TkInvokeMenu: radiobutton} {
@@ -1408,7 +1408,7 @@ test menu-8.4 {DestroyMenuEntry} {
     menu .m1
     .m1 add checkbutton -variable foo
     list [catch {.m1 delete 1} msg] $msg [destroy .m1]
-} {0 {} {}} 
+} {0 {} {}}
 test menu-8.5 {DestroyMenuEntry} {
     catch {destroy .m1}
     menu .m1
@@ -1437,7 +1437,7 @@ test menu-8.7 {DestroyMenuEntry} {
 test menu-9.1 {ConfigureMenu} {
     catch {destroy .m1}
     menu .m1
-    list [catch {.m1 configure -postcommand "beep"} msg] $msg [.m1 cget -postcommand] [destroy .m1]    
+    list [catch {.m1 configure -postcommand "beep"} msg] $msg [.m1 cget -postcommand] [destroy .m1]
 } {0 {} beep {}}
 test menu-9.2 {ConfigureMenu} {
     catch {destroy .m1}
@@ -1528,7 +1528,7 @@ test menu-11.3 {ConfigureMenuEntry} {
 } {0 {} test {}}
 test menu-11.4 {ConfigureMenuEntry} {
     catch {destroy .m1}
-    menu .m1 
+    menu .m1
     .m1 add command
     list [catch {.m1 entryconfigure 1 -accel "S"} msg] $msg [.m1 entrycget 1 -accel] [destroy .m1]
 } {0 {} S {}}
@@ -1583,13 +1583,13 @@ test menu-11.12 {ConfigureMenuEntry} {
     catch {destroy .m4}
     catch {destroy .m5}
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
-    menu .m5 
+    menu .m5
     .m5 add cascade
     list [catch {.m5 entryconfigure 1 -label "test" -menu .m1} msg] $msg [destroy .m1 .m2 .m3 .m4 .m5]
 } {0 {} {}}
@@ -1599,11 +1599,11 @@ test menu-11.13 {ConfigureMenuEntry} {
     catch {destroy .m3}
     catch {destroy .m4}
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
     list [catch {.m3 entryconfigure 1 -label "test" -menu .m1} msg] $msg [destroy .m1 .m2 .m3 .m4]
 } {0 {} {}}
@@ -2511,7 +2511,7 @@ test menu-32.8 {Ensure all menu clone commands are deleted} {
 test menu-32.9 {Ensure deleting of clones doesn't corrupt menu refs} {
     catch {destroy .menubar}
     catch {destroy .menubar.test}
-    
+
     menu .menubar
     . configure -menu .menubar
     menu .menubar.test
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 225223c..fd69425 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -51,7 +51,7 @@ test menuDraw-5.2 {TkMenuConfigureDrawOptions - old menu} {
 test menuDraw-5.3 {TkMenuConfigureDrawOptions - no disabledFg} {
 	catch {destroy .m1}
 	list [menu .m1 -disabledforeground ""] [destroy .m1]
-} {.m1 {}}	
+} {.m1 {}}
 
 test menuDraw-6.1 {TkMenuConfigureEntryDrawOptions - no tkfont specified} {
     catch {destroy .m1}
diff --git a/tests/menubut.test b/tests/menubut.test
index 3dfa1b5..ef29fcb 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -10,7 +10,7 @@
 # XXX of a procedure has tests then the whole procedure has tests,
 # XXX but many procedures have no tests.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/message.test b/tests/message.test
index 93344c4..500db55 100644
--- a/tests/message.test
+++ b/tests/message.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/msgbox.test b/tests/msgbox.test
index ec98c89..bcbaf92 100644
--- a/tests/msgbox.test
+++ b/tests/msgbox.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -108,11 +108,11 @@ proc SendEventToMsg {parent btn type} {
 set parent .
 
 set specs {
-    {"abortretryignore"  MB_ABORTRETRYIGNORE  3  {"abort"  "retry"  "ignore"}} 
-    {"ok"  		 MB_OK  	      1  {"ok"                      }} 
-    {"okcancel" 	 MB_OKCANCEL 	      2  {"ok"     "cancel"         }} 
-    {"retrycancel" 	 MB_RETRYCANCEL       2  {"retry"  "cancel"         }} 
-    {"yesno" 		 MB_YESNO 	      2  {"yes"    "no"             }} 
+    {"abortretryignore"  MB_ABORTRETRYIGNORE  3  {"abort"  "retry"  "ignore"}}
+    {"ok"  		 MB_OK  	      1  {"ok"                      }}
+    {"okcancel" 	 MB_OKCANCEL 	      2  {"ok"     "cancel"         }}
+    {"retrycancel" 	 MB_RETRYCANCEL       2  {"retry"  "cancel"         }}
+    {"yesno" 		 MB_YESNO 	      2  {"yes"    "no"             }}
     {"yesnocancel" 	 MB_YESNOCANCEL       3  {"yes"    "no"     "cancel"}}
 }
 
diff --git a/tests/obj.test b/tests/obj.test
index 25bd70f..fae6d51 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 2f9b979..c95e131 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/option.test b/tests/option.test
index 1bfcb7c..8a1cf2a 100644
--- a/tests/option.test
+++ b/tests/option.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/pack.test b/tests/pack.test
index edb9f18..83525a1 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -1019,7 +1019,7 @@ test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
 
     wm geometry .pack +100+100
 
-    # On the PC, when the width/height is configured while the window is 
+    # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index b075e18..a1562a0 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -166,7 +166,7 @@ test panedwindow-4.5 {forget subcommand, panes are unmapped} {
 
     lappend result [winfo ismapped .b] [winfo ismapped .c]
     destroy .p .b .c
-    
+
     set result
 } [list 1 1 0 1]
 test panedwindow-4.6 {forget subcommand, changes reqsize of panedwindow} {
@@ -364,7 +364,7 @@ test panedwindow-9.5 {sash dragto subcommand, errors} {
     destroy .p .b .c
     set result
 } [list 1 "expected integer but got \"bar\""]
-    
+
 test panedwindow-10.1 {sash mark/sash dragto interaction} {
     panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 4 -showhandle false
     .p add [frame .f -width 20 -height 20] [button .c -text foobar]
@@ -612,7 +612,7 @@ test panedwindow-12.17 {moving sash into "virtual" space on \
     destroy .p .f .f2 .f3
     set result
 } {68 100}
-    
+
 test panedwindow-13.1 {horizontal panedwindow lays out widgets properly} {
     panedwindow .p -showhandle false -borderwidth 2 -sashpad 2 -sashwidth 2
     foreach win {.p.f .p.f2 .p.f3} {.p add [frame $win -width 20 -height 10]}
@@ -801,7 +801,7 @@ test panedwindow-14.1 {PanestructureProc, widget yields managements} {
 test panedwindow-14.2 {PanedWindowLostSlaveProc, widget yields management} {
     # Check that the paned window correctly yields geometry management of
     # a slave when some other geometry manager steals the slave from us.
-    
+
     # This test should not cause a core dump, and it should not cause a
     # memory leak.
     destroy .p .b
@@ -868,15 +868,15 @@ test panedwindow-18.1 {MoveSash, move right} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 30 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -889,11 +889,11 @@ test panedwindow-18.2 {MoveSash, move right (unmapped) clipped by reqwidth} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -904,17 +904,17 @@ test panedwindow-18.3 {MoveSash, move right (mapped, width < reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width < reqwidth
     place .p -x 0 -y 0 -width 32
     update
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -925,17 +925,17 @@ test panedwindow-18.4 {MoveSash, move right (mapped, width > reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -width 102
     update
 
     .p sash place 0 200 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -948,11 +948,11 @@ test panedwindow-18.5 {MoveSash, move right respects minsize} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -965,10 +965,10 @@ test panedwindow-18.6 {MoveSash, move right respects minsize} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -981,11 +981,11 @@ test panedwindow-18.7 {MoveSash, move right pushes other sashes} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -998,11 +998,11 @@ test panedwindow-18.8 {MoveSash, move right pushes other sashes, respects minsiz
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1016,11 +1016,11 @@ test panedwindow-18.9 {MoveSash, move right respects minsize, exludes pad} {
     }
 
     .p sash place 0 100 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1034,11 +1034,11 @@ test panedwindow-18.10 {MoveSash, move right, negative minsize becomes 0} {
     }
 
     .p sash place 0 50 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1053,15 +1053,15 @@ test panedwindow-18.11 {MoveSash, move left} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 10 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1074,11 +1074,11 @@ test panedwindow-18.12 {MoveSash, move left, can't move outside of window} {
     }
 
     .p sash place 0 -100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1091,11 +1091,11 @@ test panedwindow-18.13 {MoveSash, move left respects minsize} {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1108,10 +1108,10 @@ test panedwindow-18.14 {MoveSash, move left respects minsize} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1124,11 +1124,11 @@ test panedwindow-18.15 {MoveSash, move left pushes other sashes} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1141,11 +1141,11 @@ test panedwindow-18.16 {MoveSash, move left pushes other sashes, respects minsiz
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1159,11 +1159,11 @@ test panedwindow-18.17 {MoveSash, move left respects minsize, exludes pad} {
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1177,11 +1177,11 @@ test panedwindow-18.18 {MoveSash, move left, negative minsize becomes 0} {
     }
 
     .p sash place 1 10 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1198,15 +1198,15 @@ test panedwindow-19.1 {MoveSash, move down} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 30
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1220,11 +1220,11 @@ test panedwindow-19.2 {MoveSash, move down (unmapped) clipped by reqheight} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the reqheight of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1236,17 +1236,17 @@ test panedwindow-19.3 {MoveSash, move down (mapped, height < reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a height < reqheight
     place .p -x 0 -y 0 -height 32
     update
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the visible height of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1258,17 +1258,17 @@ test panedwindow-19.4 {MoveSash, move down (mapped, height > reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -height 102
     update
 
     .p sash place 0 0 200
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1282,11 +1282,11 @@ test panedwindow-19.5 {MoveSash, move down respects minsize} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1300,11 +1300,11 @@ test panedwindow-19.6 {MoveSash, move down respects minsize} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1318,11 +1318,11 @@ test panedwindow-19.7 {MoveSash, move down pushes other sashes} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1336,11 +1336,11 @@ test panedwindow-19.8 {MoveSash, move down pushes other sashes, respects minsize
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1355,11 +1355,11 @@ test panedwindow-19.9 {MoveSash, move down respects minsize, exludes pad} {
     }
 
     .p sash place 0 0 100
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1374,11 +1374,11 @@ test panedwindow-19.10 {MoveSash, move right, negative minsize becomes 0} {
     }
 
     .p sash place 0 0 50
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1394,15 +1394,15 @@ test panedwindow-19.11 {MoveSash, move up} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 10
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1416,11 +1416,11 @@ test panedwindow-19.12 {MoveSash, move up, can't move outside of window} {
     }
 
     .p sash place 0 0 -100
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1434,11 +1434,11 @@ test panedwindow-19.13 {MoveSash, move up respects minsize} {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1452,10 +1452,10 @@ test panedwindow-19.14 {MoveSash, move up respects minsize} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1469,11 +1469,11 @@ test panedwindow-19.15 {MoveSash, move up pushes other sashes} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1487,11 +1487,11 @@ test panedwindow-19.16 {MoveSash, move up pushes other sashes, respects minsize}
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1506,11 +1506,11 @@ test panedwindow-19.17 {MoveSash, move up respects minsize, exludes pad} {
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1525,11 +1525,11 @@ test panedwindow-19.18 {MoveSash, move up, negative minsize becomes 0} {
     }
 
     .p sash place 1 0 10
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1629,7 +1629,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20 + (2 * $h)}] \
 			[expr {(2 * $bd) + 20}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, three panes, reqsize set properly} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1643,7 +1643,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + ($h?12:(2*$sw)) + (4*$sp) + 60}] \
 			[expr {(2 * $bd) + 20}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, sash coords} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1681,7 +1681,7 @@ foreach bd {0 2} {
 			    [expr {$bd+3}] 20 20] \
 			[list [expr {$bd+95+($h?12:2*$sw)+(4*$sp)}] \
 			    [expr {$bd+3}] 20 20]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, one slave, vertical} {
 		    # With just one slave, sashpad and sashwidth should not
@@ -1697,7 +1697,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20}] \
 			[expr {(2 * $bd) + 20 + (2 * $h)}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, three panes, vertical} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1712,7 +1712,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20}] \
 			[expr {(2 * $bd) + ($h?12:(2*$sw)) + (4*$sp) + 60}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, sash coords, vertical} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1774,7 +1774,7 @@ test panedwindow-21.2 {destroyed slave causes geometry recomputation} {
     destroy .p .f2
     set result
 } 20
-    
+
 test panedwindow-22.1 {ArrangePanes, extra space is given to the last pane} {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2
     .p add [frame .f1 -width 20 -height 20 -bg blue] \
diff --git a/tests/place.test b/tests/place.test
index ac2ece7..cc37e48 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -303,7 +303,7 @@ test place-9.12 {PlaceObjCmd, slaves errors} {
     destroy .foo
     set res
 } [list 1 "wrong # args: should be \"place slaves pathName\""]
-    
+
 test place-10.1 {ConfigureSlave} {
     catch {destroy .foo}
     frame .foo
@@ -332,7 +332,7 @@ test place-10.4 {ConfigureSlave} {
     destroy .foo
     set res
 } [list 1 "value for \"-y\" missing"]
-	
+
 test place-11.1 {PlaceObjCmd, slaves command} {
     catch {destroy .foo}
     frame .foo
diff --git a/tests/raise.test b/tests/raise.test
index a17fa2e..3b6d3e2 100644
--- a/tests/raise.test
+++ b/tests/raise.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/safe.test b/tests/safe.test
index 3e9f716..9e502ce 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -14,7 +14,7 @@ tcltest::loadTestedCommands
 
 # Can't find a usable tk.tcl in the following directories:
 #     {$p(:26:)}
-# 
+#
 # $p(:26:)/tk.tcl: script error
 # script error
 #     invoked from within
@@ -22,8 +22,8 @@ tcltest::loadTestedCommands
 #     ("uplevel" body line 1)
 #     invoked from within
 # "uplevel #0 [list source $file]"
-# 
-# 
+#
+#
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
diff --git a/tests/scale.test b/tests/scale.test
index f8e58bb..4d38a75 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 35f48bd..6920228 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -22,7 +22,7 @@ proc getTroughSize {w} {
 	    return [expr [winfo height $w] - 2*[testmetrics cyvscroll $w]]
 	} else {
 	    return [expr [winfo width $w] - 2*[testmetrics cxhscroll $w]]
-	}	    
+	}
     } else {
 	if [string match v* [$w cget -orient]] {
 	    return [expr [winfo height $w] \
@@ -45,7 +45,7 @@ proc getTroughSize {w} {
 foreach {width height} [wm minsize .] {
     set height [expr ($height < 200) ? 200 : $height]
     set width [expr ($width < 1) ? 1 : $width]
-} 
+}
 
 frame .f -height $height -width $width
 pack .f -side left
@@ -351,15 +351,15 @@ test scrollbar-3.59 {ScrollbarWidgetCmd procedure, "set" option} {
     set result
 } {0.0 0.3}
 test scrollbar-3.60 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 1.1 .4 
+    .s set 1.1 .4
     .s get
 } {1.0 1.0}
 test scrollbar-3.61 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 -.3 
+    .s set .5 -.3
     .s get
 } {0.5 0.5}
 test scrollbar-3.62 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 87 
+    .s set .5 87
     .s get
 } {0.5 1.0}
 test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -383,15 +383,15 @@ test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3 jkl} msg] $msg
 } {1 {expected integer but got "jkl"}}
 test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set -10 50 20 30 
+    .s set -10 50 20 30
     .s get
 } {0 50 0 0}
 test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 -10 20 30 
+    .s set 100 -10 20 30
     .s get
 } {100 0 20 30}
 test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 50 30 20 
+    .s set 100 50 30 20
     .s get
 } {100 50 30 30}
 test scrollbar-3.71 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -462,7 +462,7 @@ test scrollbar-6.12 {ScrollbarPosition procedure} unix {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
-    .s identify [expr [winfo width .s] / 2] 0 
+    .s identify [expr [winfo width .s] / 2] 0
 } {arrow1}
 test scrollbar-6.15 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [testmetrics cyvscroll .s] - 1]
@@ -561,7 +561,7 @@ test scrollbar-6.41 {ScrollbarPosition procedure} unix {
 } {slider}
 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] 
+		       - 1] [expr [winfo height .t.s] / 2]
 } {slider}
 test scrollbar-6.44 {ScrollbarPosition procedure} unix {
     .t.s identify 100 18
diff --git a/tests/select.test b/tests/select.test
index 8cbfd39..9d741ff 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -11,7 +11,7 @@
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/send.test b/tests/send.test
index d3fce3b..b4ed50b 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 68c6fae..5b58117 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -4,7 +4,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -48,7 +48,7 @@ foreach test {
     {-buttoncursor arrow arrow badValue {bad cursor spec "badValue"}}
     {-command {a command} {a command} {} {}}
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
-    {-disabledbackground green green non-existent 
+    {-disabledbackground green green non-existent
 	{unknown color name "non-existent"}}
     {-disabledforeground #110022 #110022 bogus {unknown color name "bogus"}}
     {-exportselection yes 1 xyzzy {expected boolean value but got "xyzzy"}}
@@ -71,7 +71,7 @@ foreach test {
     {-invalidcommand "a command" "a command" {} {}}
     {-invcmd "a command" "a command" {} {}}
     {-justify right right bogus {bad justification "bogus": must be left, right, or center}}
-    {-readonlybackground green green non-existent 
+    {-readonlybackground green green non-existent
 	{unknown color name "non-existent"}}
     {-relief groove groove 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
     {-repeatdelay 500 500 3p {expected integer but got "3p"}}
@@ -484,13 +484,13 @@ test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} {
 test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } {32}
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } {29}
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} {
@@ -636,7 +636,7 @@ test spinbox-5.11 {ConfigureSpinbox procedure} {
     pack [spinbox .e -font {{open look glyph}}]
     .e scan dragto 30
     update
-} {}    
+} {}
 
 # No tests for DisplaySpinbox.
 
@@ -1132,14 +1132,14 @@ test spinbox-13.9 {GetSpinboxIndex procedure} {
 } {1 6}
 selection clear .e
 test spinbox-13.10 {GetSpinboxIndex procedure} unix {
-    # On unix, when selection is cleared, spinbox widget's internal 
+    # On unix, when selection is cleared, spinbox widget's internal
     # selection range is reset.
 
     list [catch {.e index sel.first} msg] $msg
 } {1 {selection isn't in widget .e}}
 test spinbox-13.11 {GetSpinboxIndex procedure} win {
     # On mac and pc, when selection is cleared, spinbox widget remembers
-    # last selected range.  When selection ownership is restored to 
+    # last selected range.  When selection ownership is restored to
     # spinbox, the old range will be rehighlighted.
 
     list [catch {selection get}] [.e index sel.first]
@@ -1291,7 +1291,7 @@ test spinbox-18.1 {Spinbox widget vs hiding} {
     interp hide {} .e
     destroy .e
     list [winfo children .] [interp hidden]
-} [list {} $l]    
+} [list {} $l]
 
 ##
 ## Spinbox widget VALIDATION tests
diff --git a/tests/text.test b/tests/text.test
index 2ca5d54..d06b8b3 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -141,7 +141,7 @@ if {$tcl_platform(platform) == "windows"} {
 test text-2.5 {Tk_TextCmd procedure} {
     catch {destroy .t2}
     text .t2
-    .t2 tag cget sel -relief 
+    .t2 tag cget sel -relief
 } $relief
 test text-2.6 {Tk_TextCmd procedure} {
     catch {destroy .t2}
@@ -535,7 +535,7 @@ test text-9.26 {TextWidgetCmd procedure, "get" option} {
 test text-9.26a {TextWidgetCmd procedure, "get" option} {
     list [.t index "5.6 -4a chars"] [.t index "5.8-4d chars"]
 } {5.1 5.1}
-.t delete 5.4 
+.t delete 5.4
 .t tag add elide 5.5 5.6
 test text-9.27 {TextWidgetCmd procedure, "get" option} {
     .t get -displaychars 5.2 5.8
@@ -880,7 +880,7 @@ test text-0.2.51 {counting with tag priority eliding} {
     lappend res [.t index "1.0 +1 indices"]
     lappend res [.t index "1.0 +1 display indices"]
     lappend res [.t index "1.0 +1 display chars"]
-    lappend res [.t index end] 
+    lappend res [.t index end]
     lappend res [.t index "end -1 indices"]
     lappend res [.t index "end -1 display indices"]
     lappend res [.t index "end -1 display chars"]
@@ -1568,7 +1568,7 @@ test text-20.35a {TextSearchCmd procedure, regexp finds empty lines} {
     tk::TextSetCursor .t 4.0
     .t search -forward -regexp {^$} insert end
 } {4.0}
-    
+
 catch {destroy .t2}
 toplevel .t2
 wm geometry .t2 +0+0
@@ -2037,7 +2037,7 @@ test text-20.105 {TextSearchCmd, multiline regexp matching} {
     deleteWindows
     pack [text .t2]
     .t2 insert 1.0 {    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -2053,7 +2053,7 @@ test text-20.106 {TextSearchCmd, multiline regexp matching} {
     pack [text .t2]
     .t2 insert 1.0 {static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -2066,7 +2066,7 @@ test text-20.107 {TextSearchCmd, multiline regexp matching} {
     .t2 insert 1.0 {
 static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -3457,8 +3457,8 @@ test text-29.5 {peer widgets} {
     update ; update
     set p1 [.tt.t count -update -ypixels 1.0 end]
     set p2 [.t count -update -ypixels 5.0 11.0]
-    if {$p1 == $p2} { 
-	set res "ok" 
+    if {$p1 == $p2} {
+	set res "ok"
     } else {
         set res "$p1 and $p2 not equal"
     }
@@ -3555,7 +3555,7 @@ test text-29.12 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     lappend res [.t tag prevrange sel 1.0]
     .t configure -start 6 -end 12
@@ -3575,7 +3575,7 @@ test text-29.13 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
@@ -3594,7 +3594,7 @@ test text-29.14 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
@@ -3637,7 +3637,7 @@ test text-29.16 {peer widgets} {
     lappend res [.t index sel.last]
     destroy .t
     set res
-} {1.0 11.0} 
+} {1.0 11.0}
 test text-29.17 {peer widgets} {
     destroy .t
     pack [text .t]
@@ -3649,7 +3649,7 @@ test text-29.17 {peer widgets} {
     set res [list [catch {.t index sel.first} msg] $msg]
     destroy .t
     set res
-} {1 {text doesn't contain any characters tagged with "sel"}} 
+} {1 {text doesn't contain any characters tagged with "sel"}}
 
 proc makeText {} {
     set w .g
diff --git a/tests/textBTree.test b/tests/textBTree.test
index 1eb7c75..0fa27bb 100644
--- a/tests/textBTree.test
+++ b/tests/textBTree.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index bb009ad..aed22c1 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -590,7 +590,7 @@ if {$tcl_platform(platform) == "windows"} {
 test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
@@ -622,7 +622,7 @@ set hlth [.t cget -highlightthickness]
 test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
@@ -638,7 +638,7 @@ test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     update
     set x [list [.t index @0,0] $tk_textRelayout $tk_textRedraw]
     wm overrideredirect . 0
-    update 
+    update
     set x
 } {8.0 {16.0 17.0 15.0 14.0 13.0 12.0 11.0 10.0 9.0 8.0} {8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0}}
 test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} {
@@ -1863,7 +1863,7 @@ test textDisp-14.14 {TkTextXviewCmd procedure} {
     .t insert end "a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9\n"
     .t insert end "xxxx xxxxxxxxx xxxxxxxxxxxxx"
     .t xview moveto 0
-    .t xview scroll 21 u  
+    .t xview scroll 21 u
     set x [.t index @0,22]
     .t xview scroll -1 u
     lappend x [.t index @0,22]
@@ -2317,7 +2317,7 @@ test textDisp-17.8 {TkTextScanCmd procedure} {textfonts} {
     .t xview moveto 0
     .t scan mark 0 60
     .t scan dragto 30 100
-    .t scan dragto 25 95 
+    .t scan dragto 25 95
     .t index @0,0
 } {4.7}
 test textDisp-17.9 {TkTextScanCmd procedure} {textfonts} {
@@ -2925,7 +2925,7 @@ test textDisp-21.4 {count -displaylines regression} {
 Use the Up (cursor) key to scroll up one line at a time.  At the second press, the cursor either gets locked or jumps several lines.
 
 Connect with Tkcon.  The command
-.u count -displaylines \ 
+.u count -displaylines \
 3.10 2.173
 should give answer -1; it gives me 5.
 
@@ -3819,7 +3819,7 @@ test textDisp-29.2.5 {miscellaneous: can show last character} {
     set iWidth [lindex [.t2.t bbox end-2c] 2]
     .t2.t xview scroll 2 units
     set iWidth2 [lindex [.t2.t bbox end-2c] 2]
-    
+
     if {($iWidth == $iWidth2) && $iWidth >= 2} {
 	set result "correct"
     } else {
diff --git a/tests/textImage.test b/tests/textImage.test
index 47ea298..6cb3761 100644
--- a/tests/textImage.test
+++ b/tests/textImage.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -167,7 +167,7 @@ test textImage-1.17 {basic cget options} {
 	set result ""
 	foreach i {align padx pady image name} {
 	    lappend result $i:[.t image cget small -$i]
-	} 
+	}
 	set result
 } {align:center padx:0 pady:0 image:small name:}
 
@@ -185,7 +185,7 @@ test textImage-1.18 {basic configure options} {
 	set result ""
 	foreach {option value}  {align top padx 5 pady 7 image large name none} {
 	    .t image configure small -$option $value
-	} 
+	}
 	update
 	.t image configure small
 } {{-align {} {} center top} {-padx {} {} 0 5} {-pady {} {} 0 7} {-image {} {} {} large} {-name {} {} {} none}}
@@ -238,7 +238,7 @@ test textImage-3.1 {image change propagation} {
 	    vary configure -width $i -height $i
 	    update
 	    lappend result $i:[.t bbox vary]
-	} 
+	}
 	set result
 } {{base:0 0 5 5} {10:0 0 10 10} {20:0 0 20 20} {40:0 0 40 40}}
 
diff --git a/tests/textIndex.test b/tests/textIndex.test
index e78e54b..c53707b 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -17,7 +17,7 @@ pack append . .t {top expand fill}
 update
 .t debug on
 wm geometry . {}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
@@ -74,7 +74,7 @@ test textIndex-1.9 {TkTextMakeByteIndex: shortcut for 0} {testtext} {
     testtext .t byteindex 3 80
 } {3.5 5}
 test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} {
-    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) 
+    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # one segment
 
     testtext .t byteindex 3 5
@@ -84,7 +84,7 @@ test textIndex-1.11 {TkTextMakeByteIndex: verify index is in range} {testtext} {
     #     index += segPtr->size
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [testtext .t byteindex 3 7]
     .t mark unset foo
     set x
@@ -117,7 +117,7 @@ test textIndex-1.16 {TkTextMakeByteIndex: UTF-8 characters} {testtext} {
 } {5.18 20}
 test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     # Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f).
 
     set x [testtext .t byteindex 5 2]
@@ -125,7 +125,7 @@ test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 } {{5.2 4} y}
 test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     testtext .t byteindex 5 1
     .t get insert
 } "\u4e4f"
@@ -168,7 +168,7 @@ test textIndex-2.9 {TkTextMakeCharIndex: verify index is in range} {
     # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [.t index 3.7]
     .t mark unset foo
     set x
@@ -439,7 +439,7 @@ test textIndex-12.5 {TkTextIndexForwChars: find index} {
 test textIndex-12.6 {TkTextIndexForwChars: find index} {
     # for ( ; segPtr != NULL; segPtr = segPtr->nextPtr)
     # border condition: segPtr == NULL -> beginning of next line
-    
+
     .t index {2.3 + 11 chars}
 } 3.0
 test textIndex-12.7 {TkTextIndexForwChars: find index} {
@@ -458,7 +458,7 @@ test textIndex-12.9 {TkTextIndexForwChars: find index} {
     .t image create 2.4 -image textimage
     set x [.t get {2.3 + 3 chars}]
     .t delete 2.4
-    set x    
+    set x
 } "f"
 test textIndex-12.10 {TkTextIndexForwChars: find index} {
     # dstPtr->byteIndex += segPtr->size - byteOffset
@@ -588,11 +588,11 @@ test textIndex-14.11 {TkTextIndexBackChars: move to previous segment} {
     set x
 } 2.9
 test textIndex-14.12 {TkTextIndexBackChars: move to previous line} {
-    # (lineIndex == 0) 
+    # (lineIndex == 0)
     .t index {1.5 - 10 chars}
 } 1.0
 test textIndex-14.13 {TkTextIndexBackChars: move to previous line} {
-    # not (lineIndex == 0) 
+    # not (lineIndex == 0)
     .t index {2.5 - 10 chars}
 } 1.2
 test textIndex-14.14 {TkTextIndexBackChars: move to previous line} {
diff --git a/tests/textMark.test b/tests/textMark.test
index 67b9ae5..4b2c63a 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/textTag.test b/tests/textTag.test
index be31ebb..aed0491 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -21,7 +21,7 @@ update
 .t debug on
 wm geometry . {}
 set bigFont {Helvetica 24}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm, to make mwm forget about a previous minimum size setting.
 
@@ -798,7 +798,7 @@ test textTag-18.1 {TkTextPickCurrent tag bindings} {
     text .t -width 30 -height 4 -relief sunken -borderwidth 10 \
       -highlightthickness 10 -pady 2
     pack .t
-    
+
     .t insert end " Tag here " TAG " no tag here"
     .t tag configure TAG -borderwidth 4 -relief raised
     .t tag bind TAG <Enter>  {lappend res "%x %y tag-Enter"}
diff --git a/tests/textWind.test b/tests/textWind.test
index 2e16f7b..6eb9b0f 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -36,7 +36,7 @@ update
 .t debug on
 wm geometry . {}
 set color [expr {[winfo depth .t] > 1 ? "green" : "black"}]
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
diff --git a/tests/tk.test b/tests/tk.test
index 02b4257..9673caa 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # Copyright (c) 2002 ActiveState Corporation.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -65,7 +65,7 @@ test tk-3.8 {tk command: scaling: negative} {
 test tk-3.9 {tk command: scaling: too big} {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} {1}    
+} 1
 test tk-3.10 {tk command: scaling: widthmm} {
     tk scaling 1.25
     expr {int((25.4*[winfo screenwidth .])/(72*1.25)+0.5)-[winfo screenmmwidth .]}
diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl
index f03cd56..a75172f 100644
--- a/tests/ttk/all.tcl
+++ b/tests/ttk/all.tcl
@@ -16,5 +16,5 @@ tcltest::configure -testdir [file normalize [file dirname [info script]]]
 tcltest::configure -loadfile \
     [file join [file dirname [tcltest::testsDirectory]] constraints.tcl]
 tcltest::configure -singleproc 1
-tcltest::runAllTests
-
+set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 43f3cf1..577d449 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -3,7 +3,8 @@
 #
 
 package require Tk 8.5
-package require tcltest ; namespace import -force tcltest::*
+package require tcltest 2.2
+namespace import -force tcltest::*
 loadTestedCommands
 
 test combobox-1.0 "Combobox tests -- setup" -body {
@@ -38,7 +39,7 @@ test combobox-2.3 "current -- change value" -body {
     .cb current
 } -result 1
 
-test combobox-2.4 "current -- value not in list" -body { 
+test combobox-2.4 "current -- value not in list" -body {
     .cb set "z"
     .cb current
 } -result -1
diff --git a/tests/ttk/image.test b/tests/ttk/image.test
index a55f7f8..5e48d5c 100644
--- a/tests/ttk/image.test
+++ b/tests/ttk/image.test
@@ -23,7 +23,7 @@ test image-2.0 "Deletion of displayed image (label)" -setup {
 } -cleanup {
     destroy .ttk_image20
 } -result {}
-    
+
 test image-2.1 "Deletion of displayed image (checkbutton)" -setup {
      image create photo test.image -width 10 -height 10
 } -body {
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 28b4d2e..649c35f 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -70,7 +70,7 @@ test labelframe-3.6 "Destroy child slave" -body {
 # @@@ but seems to succeed if it's some other widget class.
 # @@@ I suspect a race condition; unable to track it down ATM.
 #
-# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc 
+# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc
 # @@@ (see manager.c r1.11). There's still probably a race condition in here.
 #
 test labelframe-4.1 "Add nonchild slave" -body {
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index 7fe5c87..c1fc6ac 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -110,8 +110,8 @@ test panedwindow-2.end "Cleanup" -body { destroy .pw }
 #
 test panedwindow-3.0 "configure pane" -body {
     ttk::panedwindow .pw
-    .pw add [listbox .pw.lb1] 
-    .pw add [listbox .pw.lb2] 
+    .pw add [listbox .pw.lb1]
+    .pw add [listbox .pw.lb2]
     .pw pane 1 -weight 2
     .pw pane 1 -weight
 } -result 2
@@ -253,7 +253,7 @@ test paned-propagation-setup "Setup." -body {
     frame .pw.f2 -width 100 -height 50
 
     list [winfo reqwidth .pw.f1] [winfo reqheight .pw.f1]
-} -result [list 100 50] 
+} -result [list 100 50]
 
 test paned-propagation-1 "Initial request size" -body {
     .pw add .pw.f1
diff --git a/tests/ttk/scrollbar.test b/tests/ttk/scrollbar.test
index 0464273..1f8d158 100644
--- a/tests/ttk/scrollbar.test
+++ b/tests/ttk/scrollbar.test
@@ -9,8 +9,8 @@ test scrollbar-swapout-1 "Use core scrollbars on OSX..." -constraints {
 } -body {
     ttk::scrollbar .sb -command "yadda"
     list [winfo class .sb] [.sb cget -command]
-} -result [list Scrollbar yadda] -cleanup { 
-    destroy .sb 
+} -result [list Scrollbar yadda] -cleanup {
+    destroy .sb
 }
 
 test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
@@ -18,7 +18,7 @@ test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
 } -body {
     ttk::style layout Vertical.Custom.TScrollbar \
     	[ttk::style layout Vertical.TScrollbar] ; # See #1833339
-    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command] [.sb cget -style]
 } -result [list TScrollbar yadda Custom.TScrollbar] -cleanup {
     destroy .sb
@@ -27,7 +27,7 @@ test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
 test scrollbar-swapout-3 "... or -class." -constraints {
     coreScrollbar
 } -body {
-    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command]
 } -result [list Custom.TScrollbar yadda] -cleanup {
     destroy .sb
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 08f2bda..38bae14 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -253,7 +253,7 @@ test spinbox-nostomp-3 "don't stomp on -variable (configure; -from/to)" -body {
 
 test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
     set SBV Apr
-    ttk::spinbox .sb 
+    ttk::spinbox .sb
     .sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
     list $SBV [.sb get]
 } -cleanup {
@@ -278,7 +278,7 @@ test spinbox-dieoctaldie-1 "Cope with leading zeros" -body {
     event generate .sb <<Decrement>>; lappend result $secs
 
     set result
-} -result [list 07 08 09 10 11 10 09 08 07] -cleanup { 
+} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
     destroy .sb
     unset secs
 }
diff --git a/tests/ttk/treetags.test b/tests/ttk/treetags.test
index 7f26e2f..f91673f 100644
--- a/tests/ttk/treetags.test
+++ b/tests/ttk/treetags.test
@@ -105,7 +105,7 @@ test treetags-1.8 "tag names" -body {
 } -result [list tag1 tag2 tag3]
 
 test treetags-1.9 "tag names - tag added to item" -body {
-    $tv item item1 -tags tag4 
+    $tv item item1 -tags tag4
     lsort [$tv tag names]
 } -result [list tag1 tag2 tag3 tag4]
 
@@ -201,12 +201,12 @@ test treetags-3.4 "stomp tags in tag binding procedure" -body {
     set result [list]
     $tv tag bind rm1 <<Remove>> { lappend ::result rm1 [%W focus] <<Remove>> }
     $tv tag bind rm2 <<Remove>> {
-    	lappend ::result rm2 [%W focus] <<Remove>> 
+    	lappend ::result rm2 [%W focus] <<Remove>>
 	%W item [%W focus] -tags {tag1}
     }
     $tv tag bind rm3 <<Remove>> { lappend ::result rm3 [%W focus] <<Remove>> }
 
-    $tv item item1 -tags {rm1 rm2 rm3} 
+    $tv item item1 -tags {rm1 rm2 rm3}
     $tv focus item1
     event generate $tv <<Remove>>
     set result
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index def709e..f3abdef 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -206,7 +206,7 @@ test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
     destroy .b
     set ttk28 {}
     pack [ttk::button .b -command {set ::ttk28 failed}]
-} -body { 
+} -body {
     bind .b <ButtonPress-1> {after 0 {.b configure -state disabled}}
     after 1 {event generate .b <ButtonPress-1>}
     after 20 {event generate .b <ButtonRelease-1>}
diff --git a/tests/ttk/validate.test b/tests/ttk/validate.test
index 417deac..0a743b3 100644
--- a/tests/ttk/validate.test
+++ b/tests/ttk/validate.test
@@ -4,7 +4,7 @@
 ##
 
 package require Tk 8.5
-package require tcltest 2.1
+package require tcltest 2.2
 namespace import -force tcltest::*
 
 loadTestedCommands
@@ -161,7 +161,7 @@ test validate-1.18 {entry widget validation} -constraints coreEntry -body {
     list [.e cget -validate] $::vVals
 } -result {none {.e -1 -1 nextdata newdata {} all forced}}
 # DIFFERENCE: ttk::entry doesn't validate when setting linked -variable
-# DIFFERENCE: ttk::entry doesn't disable validation 
+# DIFFERENCE: ttk::entry doesn't disable validation
 
 proc doval {W d i P s S v V} {
     set ::vVals [list $W $d $i $P $s $S $v $V]
diff --git a/tests/unixButton.test b/tests/unixButton.test
index a51e259..8efe976 100644
--- a/tests/unixButton.test
+++ b/tests/unixButton.test
@@ -8,13 +8,13 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # Create entries in the option database to be sure that geometry options
 # like border width have predictable values.
- 
+
 option add *Label.borderWidth 2
 option add *Label.highlightThickness 0
 option add *Label.font {Helvetica -12 bold}
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 1e8f03b..b74b075 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the procedures in the file 
+# This file is a Tcl script to test out the procedures in the file
 # tkUnixEmbed.c.  It is organized in the standard fashion for Tcl
 # tests.
 #
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 27826d4..440fdc5 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the procedures in tkUnixFont.c. 
+# This file is a Tcl script to test out the procedures in tkUnixFont.c.
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
@@ -6,13 +6,13 @@
 # underlined?"); these tests attempt to exercise the code in question,
 # but there are no results that can be checked.  Some tests depend on the
 # fonts having or not having certain properties, which may not be valid
-# at all sites.  
+# at all sites.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -124,7 +124,7 @@ test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix {
 
     font actual {-size 14}
     set x {}
-} {}    
+} {}
 
 test unixfont-3.1 {TkpDeleteFont procedure} unix {
     font actual {-family xyz}
diff --git a/tests/unixMenu.test b/tests/unixMenu.test
index 802a7c2..e6f5074 100644
--- a/tests/unixMenu.test
+++ b/tests/unixMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -931,7 +931,7 @@ test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} unix {
     .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 unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} unix {
     catch {destroy .m1}
diff --git a/tests/unixSelect.test b/tests/unixSelect.test
index c3ed11d..c09bffe 100644
--- a/tests/unixSelect.test
+++ b/tests/unixSelect.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -345,7 +345,7 @@ test unixSelect-1.19 {TkSelGetSelection procedure: INCR i18n text, utf-8} unix {
 } {1 2122 4222}
 test unixSelect-1.20 {Automatic UTF8_STRING support for selection handle} unix {
     # See Bug #666346 "Selection handling crashes under KDE 3.0"
-    label .l 
+    label .l
     selection handle .l  [list handler STRING]
     set selValue "This is the selection value"
     selection own .l
diff --git a/tests/util.test b/tests/util.test
index 86271c5..6fa0dab 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/visual.test b/tests/visual.test
index 1006e18..1c9b306 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/visual_bb.test b/tests/visual_bb.test
index 6b10f76..4560e6b 100644
--- a/tests/visual_bb.test
+++ b/tests/visual_bb.test
@@ -6,7 +6,7 @@
 # at the window to make sure it appears as expected.  Individual tests
 # are kept in separate ".tcl" files in this directory.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -48,7 +48,7 @@ test 1.1 "running visual tests" {userInteraction} {
     frame .menu -relief raised -borderwidth 1
     message .msg -font {Times 18} -relief raised -width 4i \
 	    -borderwidth 1 -text "This application provides a collection of visual tests for the Tk toolkit.  Each menu entry invokes a test, which displays information on the screen.  You can then verify visually that the information is being displayed in the correct way.  The tests under the \"Postscript\" menu exercise the Postscript-generation capabilities of canvas widgets."
-    
+
     pack .menu -side top -fill x
     pack .msg -side bottom -expand yes -fill both
 
@@ -60,7 +60,7 @@ test 1.1 "running visual tests" {userInteraction} {
     menubutton .menu.file -text "File" -menu .menu.file.m
     menu .menu.file.m
     .menu.file.m add command -label "Quit" -command end
-    
+
     menubutton .menu.group1 -text "Group 1" -menu .menu.group1.m
     menu .menu.group1.m
     .menu.group1.m add command -label "Canvas arcs" -command {runTest arc.tcl}
@@ -72,7 +72,7 @@ test 1.1 "running visual tests" {userInteraction} {
 	    -command {runTest butGeom.tcl}
     .menu.group1.m add command -label "Label/button colors" \
 	    -command {runTest butGeom2.tcl}
-    
+
     menubutton .menu.ps -text "Canvas Postscript" -menu .menu.ps.m
     menu .menu.ps.m
     .menu.ps.m add command -label "Rectangles and other graphics" \
@@ -85,11 +85,11 @@ test 1.1 "running visual tests" {userInteraction} {
 	    -command {runTest canvPsImg.tcl}
     .menu.ps.m add command -label "Arcs" \
 	    -command {runTest canvPsArc.tcl}
-    
+
     pack .menu.file .menu.group1 .menu.ps -side left -padx 1m
-    
+
     # Set up for keyboard-based menu traversal
-    
+
     bind . <Any-FocusIn> {
 	if {("%d" == "NotifyVirtual") && ("%m" == "NotifyNormal")} {
 	    focus .menu
diff --git a/tests/winButton.test b/tests/winButton.test
index 5e3dcfb..b431ca3 100644
--- a/tests/winButton.test
+++ b/tests/winButton.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -93,7 +93,7 @@ test winbutton-1.4 {TkpComputeButtonGeometry procedure} {win nonPortable} {
 	    [winfo reqwidth .b2] [winfo reqheight .b2] \
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {58 24 67 33 88 30 90 28} 
+} {58 24 67 33 88 30 90 28}
 test winbutton-1.5 {TkpComputeButtonGeometry procedure} {win nonPortable} {
     deleteWindows
     label .l1 -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)." -wraplength 1.5i -padx 0 -pady 0
diff --git a/tests/winClipboard.test b/tests/winClipboard.test
index ec84362..1776941 100644
--- a/tests/winClipboard.test
+++ b/tests/winClipboard.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winDialog.test b/tests/winDialog.test
index bb515af..477e8c9 100644
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # Copyright (c) 1998-1999 ActiveState Corporation.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winFont.test b/tests/winFont.test
index c61d124..b4e8516 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winMenu.test b/tests/winMenu.test
index 7240bf5..d3114bd 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winMsgbox.test b/tests/winMsgbox.test
index f467896..dc1b208 100644
--- a/tests/winMsgbox.test
+++ b/tests/winMsgbox.test
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2007 Pat Thoyts <patthoyts@users.sourceforge.net>
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winSend.test b/tests/winSend.test
index cd130fb..eba3ec3 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winWm.test b/tests/winWm.test
index 933d09e..838af04 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -9,7 +9,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/window.test b/tests/window.test
index 2c8f19d..e53f6cb 100644
--- a/tests/window.test
+++ b/tests/window.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 testConstraint unthreaded [expr {
diff --git a/tests/winfo.test b/tests/winfo.test
index 4ce87eb..50decf5 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -290,7 +290,7 @@ test winfo-12.2 {GetDisplayOf procedure} {
 } {1 {bad window path name "bad_window"}}
 
 # Some embedding tests
-# 
+#
 
 proc MakeEmbed {} {
     frame .con -container 1
diff --git a/tests/wm.test b/tests/wm.test
index 15526e7..15ceb2f 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -11,7 +11,7 @@
 # Window manager tests that only work on a specific platform should be placed
 # in unixWm.test or winWm.test.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/xmfbox.test b/tests/xmfbox.test
index b60bf48..ac1f4bb 100644
--- a/tests/xmfbox.test
+++ b/tests/xmfbox.test
@@ -1,4 +1,4 @@
-# xmfbox.test -- 
+# xmfbox.test --
 #
 #	This file is a Tcl script to test the file dialog that's used
 #	when the tk_strictMotif flag is set. Because the file dialog
@@ -10,7 +10,7 @@
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -51,7 +51,7 @@ proc cleanup {} {
     } msg4]
 
     if {$err0 || $err1 || $err2 || $err3 || $err4} {
-	error [list $msg0 $msg1 $msg2 $msg3 $msg4] 
+	error [list $msg0 $msg1 $msg2 $msg3 $msg4]
     }
     catch {unset foo}
     catch {destroy .foo}