Split duplicate test names [Bug 1078648]

18 files changed, 163 insertions, 158 deletions

diff --git a/ChangeLog b/ChangeLog
index 73832ae..2e52423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-04  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* tests/*.test: Resolve duplicate test names. [Bug 1078648]
+
 2004-12-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tkImgPhoto.c (Tk_PhotoPutBlock, Tk_PhotoPutZoomedBlock):
diff --git a/tests/border.test b/tests/border.test
index 185a894..db1a5f7 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: border.test,v 1.6 2004/06/17 22:38:57 dkf Exp $
+# RCS: @(#) $Id: border.test,v 1.7 2004/12/04 00:04:40 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -126,31 +126,31 @@ test border-4.1 {FreeBorderObjProc} testborder {
 
 catch {destroy .b}
 button .b
-test get-2.1 {Tk_GetReliefFromObj} {
+test border-5.1 {Tk_GetReliefFromObj} {
     .b configure -relief flat
     .b cget -relief
 } {flat}
-test get-2.2 {Tk_GetReliefFromObj} {
+test border-5.2 {Tk_GetReliefFromObj} {
     .b configure -relief groove
     .b cget -relief
 } {groove}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.3 {Tk_GetReliefFromObj} {
     .b configure -relief raised
     .b cget -relief
 } {raised}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.4 {Tk_GetReliefFromObj} {
     .b configure -relief ridge
     .b cget -relief
 } {ridge}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.5 {Tk_GetReliefFromObj} {
     .b configure -relief solid
     .b cget -relief
 } {solid}
-test get-2.3 {Tk_GetReliefFromObj} {
+test border-5.6 {Tk_GetReliefFromObj} {
     .b configure -relief sunken
     .b cget -relief
 } {sunken}
-test get-2.4 {Tk_GetReliefFromObj - error} {
+test border-5.7 {Tk_GetReliefFromObj - error} {
     list [catch {.b configure -relief upanddown} msg] $msg
 } {1 {bad relief "upanddown": must be flat, groove, raised, ridge, solid, or sunken}}
 
diff --git a/tests/button.test b/tests/button.test
index 198f21e..49f117b 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: button.test,v 1.17 2004/11/03 18:07:46 dgp Exp $
+# RCS: @(#) $Id: button.test,v 1.18 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -450,7 +450,7 @@ test button-6.2 {ConfigureButton - textvariable trace} {
     set x New
     lindex [.b1 configure -text] 4
 } {From-y}
-test button-6.2 {ConfigureButton - variable traces} {
+test button-6.2a {ConfigureButton - variable traces} {
     catch {destroy .b1}
     catch {unset x}
     checkbutton .b1 -variable x
diff --git a/tests/entry.test b/tests/entry.test
index f17ad21..7732e8a 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: entry.test,v 1.18 2004/06/24 12:45:42 dkf Exp $
+# RCS: @(#) $Id: entry.test,v 1.19 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -249,7 +249,7 @@ test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} {
     .e configure -state normal
     .e get
 } {01234567890}
-test entry-3.27 {EntryWidgetCmd procedure, "delete" widget command} {
+test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} {
     .e delete 0 end
     .e insert end "01234567890"
     .e configure -state readonly
@@ -313,7 +313,7 @@ test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} {
     .e configure -state normal
     .e get
 } {01234567890}
-test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} {
+test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} {
     .e delete 0 end
     .e insert end "01234567890"
     .e configure -state readonly
@@ -450,7 +450,7 @@ test entry-3.64 {EntryWidgetCmd procedure, "selection" widget command} {
     .e configure -state normal
     list [.e index sel.first] [.e index sel.last]
 } {0 10}
-test entry-3.64 {EntryWidgetCmd procedure, "selection" widget command} {
+test entry-3.64a {EntryWidgetCmd procedure, "selection" widget command} {
     .e delete 0 end
     .e insert end 0123456789
     .e selection range 0 end
@@ -462,7 +462,7 @@ test entry-3.64 {EntryWidgetCmd procedure, "selection" widget command} {
 .e delete 0 end
 .e insert end "This is quite a long text string, so long that it "
 .e insert end "runs off the end of the window quite a bit."
-test entry-3.64 {EntryWidgetCmd procedure, "selection to" widget command} {
+test entry-3.64b {EntryWidgetCmd procedure, "selection to" widget command} {
     list [catch {.e select to 2 3} msg] $msg
 } {1 {wrong # args: should be ".e selection to index"}}
 test entry-3.65 {EntryWidgetCmd procedure, "xview" widget command} {
diff --git a/tests/image.test b/tests/image.test
index be119e6..b0264f0 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: image.test,v 1.12 2003/11/18 01:47:51 dgp Exp $
+# RCS: @(#) $Id: image.test,v 1.13 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -91,7 +91,7 @@ test image-1.11 {Tk_ImageCmd procedure, "create" option with same name as main w
     removeFile script
     set x
 } {0 {1 {images may not be named the same as the main window}}}
-test image-1.11 {Tk_ImageCmd, "create" option: do not generated command name in use} -setup {
+test image-1.12 {Tk_ImageCmd, "create" option: do not generated command name in use} -setup {
     set i [image create bitmap]
     regexp {^image(\d+)$} $i -> serial
     incr serial
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 05f8297..d3193b9 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -9,7 +9,7 @@
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
 #
-# RCS: @(#) $Id: imgPhoto.test,v 1.19 2004/05/23 17:34:48 dkf Exp $
+# RCS: @(#) $Id: imgPhoto.test,v 1.20 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -408,7 +408,7 @@ proc checkImgTransLoopResetSet {img width height} {
     }
     return $result
 }
-test imgPhoto-4.68 {ImgPhotoCmd procedure: transparency set option} {
+test imgPhoto-4.67a {ImgPhotoCmd procedure: transparency set option} {
     checkImgTransLoopResetSet p1 3 3
 } {0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 2 1 0 1 1 1 2 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 1 0 1 1 1 2 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 1 1 2 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 0 1 2 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 0 1 1 2 0 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 0 1 1 1 2 2 1 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 2 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 . 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 , 0 0 0 1 0 2 1 0 1 1 1 2 2 0 2 1 2 2 .}
 catch {rename checkImgTransLoopSetReset {}}
diff --git a/tests/listbox.test b/tests/listbox.test
index ef9de1c..73b068a 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: listbox.test,v 1.23 2003/10/13 00:54:45 hobbs Exp $
+# RCS: @(#) $Id: listbox.test,v 1.24 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -1864,7 +1864,7 @@ test listbox-21.12 {ListboxListVarProc, cleanup item attributes} {
     set x [list 0 1 2 3 4 5 6]
     .l itemcget end -fg
 } {}
-test listbox-21.12 {ListboxListVarProc, cleanup item attributes} {
+test listbox-21.12a {ListboxListVarProc, cleanup item attributes} {
     catch {destroy .l}
     set x [list a b c d e f g]
     listbox .l -listvar x
@@ -2030,7 +2030,7 @@ test listbox-24.3 {itemcget} {
     catch {.l itemcget 0} result
     set result
 } {wrong # args: should be ".l itemcget index option"}
-test listbox-24.3 {itemcget, itemcg shortcut} {
+test listbox-24.4 {itemcget, itemcg shortcut} {
     catch {destroy .l}
     listbox .l
     .l insert end a b c d
diff --git a/tests/oldpack.test b/tests/oldpack.test
index f12b32d..445b0a1 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: oldpack.test,v 1.7 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: oldpack.test,v 1.8 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -31,22 +31,22 @@ frame .pack.violet -width 80 -height 20
 label .pack.violet.l -text P -bd 2 -relief raised
 place .pack.violet.l -relwidth 1.0 -relheight 1.0
 
-test pack-1.1 {basic positioning} {
+test oldpack-1.1 {basic positioning} {
     pack ap .pack .pack.red top
     update
     winfo geometry .pack.red
 } 10x20+45+0
-test pack-1.2 {basic positioning} {
+test oldpack-1.2 {basic positioning} {
     pack append .pack .pack.red bottom
     update
     winfo geometry .pack.red
 } 10x20+45+80
-test pack-1.3 {basic positioning} {
+test oldpack-1.3 {basic positioning} {
     pack append .pack .pack.red left
     update
     winfo geometry .pack.red
 } 10x20+0+40
-test pack-1.4 {basic positioning} {
+test oldpack-1.4 {basic positioning} {
     pack append .pack .pack.red right
     update
     winfo geometry .pack.red
@@ -55,22 +55,22 @@ test pack-1.4 {basic positioning} {
 # Try adding padding around the window and make sure that the
 # window gets a larger frame.
 
-test pack-2.1 {padding} {
+test oldpack-2.1 {padding} {
     pack append .pack .pack.red {t padx 20}
     update
     winfo geometry .pack.red
 } 10x20+45+0
-test pack-2.2 {padding} {
+test oldpack-2.2 {padding} {
     pack append .pack .pack.red {top pady 20}
     update
     winfo geometry .pack.red
 } 10x20+45+10
-test pack-2.3 {padding} {
+test oldpack-2.3 {padding} {
     pack append .pack .pack.red {l padx 20}
     update
     winfo geometry .pack.red
 } 10x20+10+40
-test pack-2.4 {padding} {
+test oldpack-2.4 {padding} {
     pack append .pack .pack.red {left pady 20}
     update
     winfo geometry .pack.red
@@ -80,102 +80,102 @@ test pack-2.4 {padding} {
 # make sure they all work.  Try two differenet frame locations,
 # to make sure that frame offsets are being added in correctly.
 
-test pack-3.1 {framing} {
+test oldpack-3.1 {framing} {
     pack append .pack .pack.red {b padx 20 pady 30}
     update
     winfo geometry .pack.red
 } 10x20+45+65
-test pack-3.2 {framing} {
+test oldpack-3.2 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 fr n}
     update
     winfo geometry .pack.red
 } 10x20+45+50
-test pack-3.3 {framing} {
+test oldpack-3.3 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame ne}
     update
     winfo geometry .pack.red
 } 10x20+90+50
-test pack-3.4 {framing} {
+test oldpack-3.4 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame e}
     update
     winfo geometry .pack.red
 } 10x20+90+65
-test pack-3.5 {framing} {
+test oldpack-3.5 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame se}
     update
     winfo geometry .pack.red
 } 10x20+90+80
-test pack-3.6 {framing} {
+test oldpack-3.6 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame s}
     update
     winfo geometry .pack.red
 } 10x20+45+80
-test pack-3.7 {framing} {
+test oldpack-3.7 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame sw}
     update
     winfo geometry .pack.red
 } 10x20+0+80
-test pack-3.8 {framing} {
+test oldpack-3.8 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame w}
     update
     winfo geometry .pack.red
 } 10x20+0+65
-test pack-3.9 {framing} {
+test oldpack-3.9 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame nw}
     update
     winfo geometry .pack.red
 } 10x20+0+50
-test pack-3.10 {framing} {
+test oldpack-3.10 {framing} {
     pack append .pack .pack.red {bottom padx 20 pady 30 frame c}
     update
     winfo geometry .pack.red
 } 10x20+45+65
-test pack-3.11 {framing} {
+test oldpack-3.11 {framing} {
     pack append .pack .pack.red {r padx 20 pady 30}
     update
     winfo geometry .pack.red
 } 10x20+80+40
-test pack-3.12 {framing} {
+test oldpack-3.12 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame n}
     update
     winfo geometry .pack.red
 } 10x20+80+0
-test pack-3.13 {framing} {
+test oldpack-3.13 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame ne}
     update
     winfo geometry .pack.red
 } 10x20+90+0
-test pack-3.14 {framing} {
+test oldpack-3.14 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame e}
     update
     winfo geometry .pack.red
 } 10x20+90+40
-test pack-3.15 {framing} {
+test oldpack-3.15 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame se}
     update
     winfo geometry .pack.red
 } 10x20+90+80
-test pack-3.16 {framing} {
+test oldpack-3.16 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame s}
     update
     winfo geometry .pack.red
 } 10x20+80+80
-test pack-3.17 {framing} {
+test oldpack-3.17 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame sw}
     update
     winfo geometry .pack.red
 } 10x20+70+80
-test pack-3.18 {framing} {
+test oldpack-3.18 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame w}
     update
     winfo geometry .pack.red
 } 10x20+70+40
-test pack-3.19 {framing} {
+test oldpack-3.19 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame nw}
     update
     winfo geometry .pack.red
 } 10x20+70+0
-test pack-3.20 {framing} {
+test oldpack-3.20 {framing} {
     pack append .pack .pack.red {right padx 20 pady 30 frame center}
     update
     winfo geometry .pack.red
@@ -184,32 +184,32 @@ test pack-3.20 {framing} {
 # Try out various filling combinations in a couple of different
 # frame locations.
 
-test pack-4.1 {filling} {
+test oldpack-4.1 {filling} {
     pack append .pack .pack.red {bottom padx 20 pady 30 fillx}
     update
     winfo geometry .pack.red
 } 100x20+0+65
-test pack-4.2 {filling} {
+test oldpack-4.2 {filling} {
     pack append .pack .pack.red {bottom padx 20 pady 30 filly}
     update
     winfo geometry .pack.red
 } 10x50+45+50
-test pack-4.3 {filling} {
+test oldpack-4.3 {filling} {
     pack append .pack .pack.red {bottom padx 20 pady 30 fill}
     update
     winfo geometry .pack.red
 } 100x50+0+50
-test pack-4.4 {filling} {
+test oldpack-4.4 {filling} {
     pack append .pack .pack.red {right padx 20 pady 30 fillx}
     update
     winfo geometry .pack.red
 } 30x20+70+40
-test pack-4.5 {filling} {
+test oldpack-4.5 {filling} {
     pack append .pack .pack.red {right padx 20 pady 30 filly}
     update
     winfo geometry .pack.red
 } 10x100+80+0
-test pack-4.6 {filling} {
+test oldpack-4.6 {filling} {
     pack append .pack .pack.red {right padx 20 pady 30 fill}
     update
     winfo geometry .pack.red
@@ -223,55 +223,55 @@ test pack-4.6 {filling} {
 pack append .pack .pack.red top .pack.green top .pack.blue top \
 	.pack.violet top
 update
-test pack-5.1 {multiple windows} {winfo geometry .pack.red} 10x20+45+0
-test pack-5.2 {multiple windows} {winfo geometry .pack.green} 30x40+35+20
-test pack-5.3 {multiple windows} {winfo geometry .pack.blue} 40x40+30+60
-test pack-5.4 {multiple windows} {winfo ismapped .pack.violet} 0
+test oldpack-5.1 {multiple windows} {winfo geometry .pack.red} 10x20+45+0
+test oldpack-5.2 {multiple windows} {winfo geometry .pack.green} 30x40+35+20
+test oldpack-5.3 {multiple windows} {winfo geometry .pack.blue} 40x40+30+60
+test oldpack-5.4 {multiple windows} {winfo ismapped .pack.violet} 0
 pack b .pack.blue .pack.violet top
 update
-test pack-5.5 {multiple windows} {winfo ismapped .pack.violet} 1
-test pack-5.6 {multiple windows} {winfo geometry .pack.violet} 80x20+10+60
-test pack-5.7 {multiple windows} {winfo geometry .pack.blue} 40x20+30+80
+test oldpack-5.5 {multiple windows} {winfo ismapped .pack.violet} 1
+test oldpack-5.6 {multiple windows} {winfo geometry .pack.violet} 80x20+10+60
+test oldpack-5.7 {multiple windows} {winfo geometry .pack.blue} 40x20+30+80
 pack after .pack.blue .pack.red top
 update
-test pack-5.8 {multiple windows} {winfo geometry .pack.green} 30x40+35+0
-test pack-5.9 {multiple windows} {winfo geometry .pack.violet} 80x20+10+40
-test pack-5.10 {multiple windows} {winfo geometry .pack.blue} 40x40+30+60
-test pack-5.11 {multiple windows} {winfo ismapped .pack.red} 0
+test oldpack-5.8 {multiple windows} {winfo geometry .pack.green} 30x40+35+0
+test oldpack-5.9 {multiple windows} {winfo geometry .pack.violet} 80x20+10+40
+test oldpack-5.10 {multiple windows} {winfo geometry .pack.blue} 40x40+30+60
+test oldpack-5.11 {multiple windows} {winfo ismapped .pack.red} 0
 pack before .pack.green .pack.red right .pack.blue left
 update
-test pack-5.12 {multiple windows} {winfo ismapped .pack.red} 1
-test pack-5.13 {multiple windows} {winfo geometry .pack.red} 10x20+90+40
-test pack-5.14 {multiple windows} {winfo geometry .pack.blue} 40x40+0+30
-test pack-5.15 {multiple windows} {winfo geometry .pack.green} 30x40+50+0
-test pack-5.16 {multiple windows} {winfo geometry .pack.violet} 50x20+40+40
+test oldpack-5.12 {multiple windows} {winfo ismapped .pack.red} 1
+test oldpack-5.13 {multiple windows} {winfo geometry .pack.red} 10x20+90+40
+test oldpack-5.14 {multiple windows} {winfo geometry .pack.blue} 40x40+0+30
+test oldpack-5.15 {multiple windows} {winfo geometry .pack.green} 30x40+50+0
+test oldpack-5.16 {multiple windows} {winfo geometry .pack.violet} 50x20+40+40
 pack append .pack .pack.violet left .pack.green bottom .pack.red bottom \
 	.pack.blue bottom
 update
-test pack-5.17 {multiple windows} {winfo geometry .pack.violet} 80x20+0+40
-test pack-5.18 {multiple windows} {winfo geometry .pack.green} 20x40+80+60
-test pack-5.19 {multiple windows} {winfo geometry .pack.red} 10x20+85+40
-test pack-5.20 {multiple windows} {winfo geometry .pack.blue} 20x40+80+0
+test oldpack-5.17 {multiple windows} {winfo geometry .pack.violet} 80x20+0+40
+test oldpack-5.18 {multiple windows} {winfo geometry .pack.green} 20x40+80+60
+test oldpack-5.19 {multiple windows} {winfo geometry .pack.red} 10x20+85+40
+test oldpack-5.20 {multiple windows} {winfo geometry .pack.blue} 20x40+80+0
 pack after .pack.blue .pack.blue top .pack.red right .pack.green right \
 	.pack.violet right
 update
-test pack-5.21 {multiple windows} {winfo geometry .pack.blue} 40x40+30+0
-test pack-5.22 {multiple windows} {winfo geometry .pack.red} 10x20+90+60
-test pack-5.23 {multiple windows} {winfo geometry .pack.green} 30x40+60+50
-test pack-5.24 {multiple windows} {winfo geometry .pack.violet} 60x20+0+60
+test oldpack-5.21 {multiple windows} {winfo geometry .pack.blue} 40x40+30+0
+test oldpack-5.22 {multiple windows} {winfo geometry .pack.red} 10x20+90+60
+test oldpack-5.23 {multiple windows} {winfo geometry .pack.green} 30x40+60+50
+test oldpack-5.24 {multiple windows} {winfo geometry .pack.violet} 60x20+0+60
 pack after .pack.blue .pack.red left .pack.green left .pack.violet left
 update
-test pack-5.25 {multiple windows} {winfo geometry .pack.blue} 40x40+30+0
-test pack-5.26 {multiple windows} {winfo geometry .pack.red} 10x20+0+60
-test pack-5.27 {multiple windows} {winfo geometry .pack.green} 30x40+10+50
-test pack-5.28 {multiple windows} {winfo geometry .pack.violet} 60x20+40+60
+test oldpack-5.25 {multiple windows} {winfo geometry .pack.blue} 40x40+30+0
+test oldpack-5.26 {multiple windows} {winfo geometry .pack.red} 10x20+0+60
+test oldpack-5.27 {multiple windows} {winfo geometry .pack.green} 30x40+10+50
+test oldpack-5.28 {multiple windows} {winfo geometry .pack.violet} 60x20+40+60
 pack append .pack .pack.violet left .pack.green left .pack.blue left \
 	.pack.red left
 update
-test pack-5.29 {multiple windows} {winfo geometry .pack.violet} 80x20+0+40
-test pack-5.30 {multiple windows} {winfo geometry .pack.green} 20x40+80+30
-test pack-5.31 {multiple windows} {winfo ismapped .pack.blue} 0
-test pack-5.32 {multiple windows} {winfo ismapped .pack.red} 0
+test oldpack-5.29 {multiple windows} {winfo geometry .pack.violet} 80x20+0+40
+test oldpack-5.30 {multiple windows} {winfo geometry .pack.green} 20x40+80+30
+test oldpack-5.31 {multiple windows} {winfo ismapped .pack.blue} 0
+test oldpack-5.32 {multiple windows} {winfo ismapped .pack.red} 0
 
 
 # Test the ability of the packer to propagate geometry information
@@ -283,25 +283,25 @@ test pack-5.32 {multiple windows} {winfo ismapped .pack.red} 0
 pack append .pack .pack.red top .pack.green top .pack.blue top \
 	.pack.violet top
 update
-test pack-6.1 {geometry propagation} {winfo reqwidth .pack} 80
-test pack-6.2 {geometry propagation} {winfo reqheight .pack} 120
+test oldpack-6.1 {geometry propagation} {winfo reqwidth .pack} 80
+test oldpack-6.2 {geometry propagation} {winfo reqheight .pack} 120
 destroy .pack.violet
 update
-test pack-6.3 {geometry propagation} {winfo reqwidth .pack} 40
-test pack-6.4 {geometry propagation} {winfo reqheight .pack} 100
+test oldpack-6.3 {geometry propagation} {winfo reqwidth .pack} 40
+test oldpack-6.4 {geometry propagation} {winfo reqheight .pack} 100
 frame .pack.violet -width 80 -height 20 -bg violet
 label .pack.violet.l -text P -bd 2 -relief raised
 place .pack.violet.l -relwidth 1.0 -relheight 1.0
 pack append .pack .pack.red left .pack.green right .pack.blue bottom \
 	.pack.violet top
 update
-test pack-6.5 {geometry propagation} {winfo reqwidth .pack} 120
-test pack-6.6 {geometry propagation} {winfo reqheight .pack} 60
+test oldpack-6.5 {geometry propagation} {winfo reqwidth .pack} 120
+test oldpack-6.6 {geometry propagation} {winfo reqheight .pack} 60
 pack append .pack .pack.violet top .pack.green top .pack.blue left \
 	.pack.red left
 update
-test pack-6.7 {geometry propagation} {winfo reqwidth .pack} 80
-test pack-6.8 {geometry propagation} {winfo reqheight .pack} 100
+test oldpack-6.7 {geometry propagation} {winfo reqwidth .pack} 80
+test oldpack-6.8 {geometry propagation} {winfo reqheight .pack} 100
 
 # Test the "expand" option, and make sure space is evenly divided
 # when several windows request expansion.
@@ -309,21 +309,21 @@ test pack-6.8 {geometry propagation} {winfo reqheight .pack} 100
 pack append .pack .pack.violet top .pack.green {left e} \
 	.pack.blue {left expand} .pack.red {left expand}
 update
-test pack-7.1 {multiple expanded windows} {
+test oldpack-7.1 {multiple expanded windows} {
     pack append .pack .pack.violet top .pack.green {left e} \
 	    .pack.blue {left expand} .pack.red {left expand}
     update
     list [winfo geometry .pack.green] [winfo geometry .pack.blue] \
 	    [winfo geometry .pack.red]
 } {30x40+3+40 40x40+39+40 10x20+86+50}
-test pack-7.2 {multiple expanded windows} {
+test oldpack-7.2 {multiple expanded windows} {
     pack append .pack .pack.green left .pack.violet {bottom expand} \
 	    .pack.blue {bottom expand} .pack.red {bottom expand}
     update
     list [winfo geometry .pack.violet] [winfo geometry .pack.blue] \
 	    [winfo geometry .pack.red]
 } {70x20+30+77 40x40+45+30 10x20+60+3}
-test pack-7.3 {multiple expanded windows} {
+test oldpack-7.3 {multiple expanded windows} {
     foreach i [winfo child .pack] {
 	pack unpack $i
     }
@@ -333,7 +333,7 @@ test pack-7.3 {multiple expanded windows} {
     list [winfo geometry .pack.green] [winfo geometry .pack.red] \
 	    [winfo geometry .pack.blue]
 } {40x100+0+0 20x100+40+0 40x40+60+0}
-test pack-7.4 {multiple expanded windows} {
+test oldpack-7.4 {multiple expanded windows} {
     foreach i [winfo child .pack] {
 	pack unpack $i
     }
@@ -343,7 +343,7 @@ test pack-7.4 {multiple expanded windows} {
     list [winfo geometry .pack.red] [winfo geometry .pack.violet] \
 	    [winfo geometry .pack.blue]
 } {10x20+45+5 80x20+10+35 40x40+60+60}
-test pack-7.5 {multiple expanded windows} {
+test oldpack-7.5 {multiple expanded windows} {
     foreach i [winfo child .pack] {
 	pack unpack $i
     }
@@ -351,7 +351,7 @@ test pack-7.5 {multiple expanded windows} {
     update
     list [winfo geometry .pack.green] [winfo geometry .pack.red]
 } {30x40+70+60 10x20+30+40}
-test pack-7.6 {multiple expanded windows} {
+test oldpack-7.6 {multiple expanded windows} {
     foreach i [winfo child .pack] {
 	pack unpack $i
     }
@@ -366,116 +366,116 @@ test pack-7.6 {multiple expanded windows} {
 
 # Syntax errors on pack commands
 
-test pack-8.1 {syntax errors} {
+test oldpack-8.1 {syntax errors} {
     set msg ""
     set result [catch {pack} msg]
     concat $result $msg
 } {1 wrong # args: should be "pack option arg ?arg ...?"}
-test pack-8.2 {syntax errors} {
+test oldpack-8.2 {syntax errors} {
     set msg ""
     set result [catch {pack append} msg]
     concat $result $msg
 } {1 wrong # args: should be "pack option arg ?arg ...?"}
-test pack-8.3 {syntax errors} {
+test oldpack-8.3 {syntax errors} {
     set msg ""
     set result [catch {pack gorp foo} msg]
     concat $result $msg
 } {1 bad option "gorp": must be configure, forget, info, propagate, or slaves}
-test pack-8.4 {syntax errors} {
+test oldpack-8.4 {syntax errors} {
     set msg ""
     set result [catch {pack a .pack} msg]
     concat $result $msg
 } {1 bad option "a": must be configure, forget, info, propagate, or slaves}
-test pack-8.5 {syntax errors} {
+test oldpack-8.5 {syntax errors} {
     set msg ""
     set result [catch {pack after foobar} msg]
     concat $result $msg
 } {1 bad window path name "foobar"}
-test pack-8.6 {syntax errors} {
+test oldpack-8.6 {syntax errors} {
     frame .pack.yellow -bg yellow
     set msg ""
     set result [catch {pack after .pack.yellow} msg]
     destroy .pack.yellow
     concat $result $msg
 } {1 window ".pack.yellow" isn't packed}
-test pack-8.7 {syntax errors} {
+test oldpack-8.7 {syntax errors} {
     set msg ""
     set result [catch {pack append foobar} msg]
     concat $result $msg
 } {1 bad window path name "foobar"}
-test pack-8.8 {syntax errors} {
+test oldpack-8.8 {syntax errors} {
     set msg ""
     set result [catch {pack before foobar} msg]
     concat $result $msg
 } {1 bad window path name "foobar"}
-test pack-8.9 {syntax errors} {
+test oldpack-8.9 {syntax errors} {
     frame .pack.yellow -bg yellow
     set msg ""
     set result [catch {pack before .pack.yellow} msg]
     destroy .pack.yellow
     concat $result $msg
 } {1 window ".pack.yellow" isn't packed}
-test pack-8.10 {syntax errors} {
+test oldpack-8.10 {syntax errors} {
     set msg ""
     set result [catch {pack info .pack help} msg]
     concat $result $msg
 } {1 wrong # args: should be "pack info window"}
-test pack-8.11 {syntax errors} {
+test oldpack-8.11 {syntax errors} {
     set msg ""
     set result [catch {pack info foobar} msg]
     concat $result $msg
 } {1 bad window path name "foobar"}
-test pack-8.12 {syntax errors} {
+test oldpack-8.12 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue} msg]
     concat $result $msg
 } {1 wrong # args: window ".pack.blue" should be followed by options}
-test pack-8.13 {syntax errors} {
+test oldpack-8.13 {syntax errors} {
     set msg ""
     set result [catch {pack append . .pack.blue top} msg]
     concat $result $msg
 } {1 can't pack .pack.blue inside .}
-test pack-8.14 {syntax errors} {
+test oldpack-8.14 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue f} msg]
     concat $result $msg
 } {1 bad option "f": should be top, bottom, left, right, expand, fill, fillx, filly, padx, pady, or frame}
-test pack-8.15 {syntax errors} {
+test oldpack-8.15 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue pad} msg]
     concat $result $msg
 } {1 bad option "pad": should be top, bottom, left, right, expand, fill, fillx, filly, padx, pady, or frame}
-test pack-8.16 {syntax errors} {
+test oldpack-8.16 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue {frame south}} msg]
     concat $result $msg
 } {1 bad anchor "south": must be n, ne, e, se, s, sw, w, nw, or center}
-test pack-8.17 {syntax errors} {
+test oldpack-8.17 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue {padx -2}} msg]
     concat $result $msg
 } {1 bad pad value "-2": must be positive screen distance}
-test pack-8.18 {syntax errors} {
+test oldpack-8.18 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue {padx}} msg]
     concat $result $msg
 } {1 wrong # args: "padx" option must be followed by screen distance}
-test pack-8.19 {syntax errors} {
+test oldpack-8.19 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue {pady -2}} msg]
     concat $result $msg
 } {1 bad pad value "-2": must be positive screen distance}
-test pack-8.20 {syntax errors} {
+test oldpack-8.20 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue {pady}} msg]
     concat $result $msg
 } {1 wrong # args: "pady" option must be followed by screen distance}
-test pack-8.21 {syntax errors} {
+test oldpack-8.21 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue "\{abc"} msg]
     concat $result $msg
 } {1 unmatched open brace in list}
-test pack-8.22 {syntax errors} {
+test oldpack-8.22 {syntax errors} {
     set msg ""
     set result [catch {pack append .pack .pack.blue frame} msg]
     concat $result $msg
@@ -483,21 +483,21 @@ test pack-8.22 {syntax errors} {
 
 # Test "pack info" command output.
 
-test pack-9.1 {information output} {
+test oldpack-9.1 {information output} {
     pack append .pack .pack.blue {top fillx frame n} \
 	.pack.red {bottom filly frame s} .pack.green {left fill frame w} \
 	.pack.violet {right expand frame e}
     list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
 	    [pack info .pack.green] [pack info .pack.violet]
 } {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor n -expand 0 -fill x -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor s -expand 0 -fill y -ipadx 0 -ipady 0 -padx 0 -pady 0 -side bottom} {-in .pack -anchor w -expand 0 -fill both -ipadx 0 -ipady 0 -padx 0 -pady 0 -side left} {-in .pack -anchor e -expand 1 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side right}}
-test pack-9.2 {information output} {
+test oldpack-9.2 {information output} {
     pack append .pack .pack.blue {padx 10 frame nw} \
 	.pack.red {pady 20 frame ne} .pack.green {frame se} \
 	.pack.violet {frame sw}
     list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
 	    [pack info .pack.green] [pack info .pack.violet]
 } {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor nw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 5 -pady 0 -side top} {-in .pack -anchor ne -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 10 -side top} {-in .pack -anchor se -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor sw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
-test pack-9.3 {information output} {
+test oldpack-9.3 {information output} {
     pack append .pack .pack.blue {frame center} .pack.red {frame center} \
 	.pack.green {frame c} .pack.violet {frame c}
     list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
diff --git a/tests/pack.test b/tests/pack.test
index cb514e7..2ca2e13 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: pack.test,v 1.12 2003/04/01 21:06:48 dgp Exp $
+# RCS: @(#) $Id: pack.test,v 1.13 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -132,7 +132,7 @@ test pack-2.11 {x padding and filling} {
 test pack-2.12 {x padding and filling} {
     pack1 -side top -ipadx 5 -padx 10 -fill x
 } {280x40+10+0 300x160+0+40}
-test pack-2.12 {x padding and filling} {
+test pack-2.12a {x padding and filling} {
     pack1 -side top -ipadx 5 -padx {5 15} -fill x
 } {280x40+5+0 300x160+0+40}
 set pad [winfo pixels .pack 1c]
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index c1adf58..3c22383 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: panedwindow.test,v 1.18 2004/10/26 08:07:28 dkf Exp $
+# RCS: @(#) $Id: panedwindow.test,v 1.19 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -2445,7 +2445,7 @@ test panedwindow-27.14 {identify subcommand errors} {
     destroy .p
     set result
 } [list 1 "expected integer but got \"foo\""]
-test panedwindow-27.14 {identify subcommand errors} {
+test panedwindow-27.14a {identify subcommand errors} {
     panedwindow .p
     set result [list [catch {.p identify 0 bar} msg] $msg]
     destroy .p
diff --git a/tests/text.test b/tests/text.test
index e0aa117..7ea2e2b 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: text.test,v 1.36 2004/11/20 15:45:35 vincentdarley Exp $
+# RCS: @(#) $Id: text.test,v 1.37 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -489,10 +489,10 @@ test text-9.16 {TextWidgetCmd procedure, "get" option} {
 test text-9.17 {TextWidgetCmd procedure, "get" option} {
     .t index "5.2 +3 indices"
 } {5.5}
-test text-9.17 {TextWidgetCmd procedure, "get" option} {
+test text-9.17a {TextWidgetCmd procedure, "get" option} {
     .t index "5.2 +3chars"
 } {5.5}
-test text-9.17 {TextWidgetCmd procedure, "get" option} {
+test text-9.17b {TextWidgetCmd procedure, "get" option} {
     .t index "5.2 +3displayindices"
 } {5.5}
 .t tag configure elide -elide 1
@@ -524,18 +524,18 @@ test text-9.24 {TextWidgetCmd procedure, "get" option} {
 test text-9.25 {TextWidgetCmd procedure, "get" option} {
     list [.t index "5.1 +4indices"] [.t index "5.1+4d indices"]
 } {5.5 5.7}
-test text-9.26 {TextWidgetCmd procedure, "get" option} {
+test text-9.25a {TextWidgetCmd procedure, "get" option} {
     list [.t index "5.1 +4a chars"] [.t index "5.1+4d chars"]
 } {5.6 5.8}
-test text-9.25 {TextWidgetCmd procedure, "get" option} {
+test text-9.26 {TextWidgetCmd procedure, "get" option} {
     list [.t index "5.5 -4indices"] [.t index "5.7-4d indices"]
 } {5.1 5.1}
-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 tag add elide 5.5 5.6
-test text-9.23 {TextWidgetCmd procedure, "get" option} {
+test text-9.27 {TextWidgetCmd procedure, "get" option} {
     .t get -displaychars 5.2 5.8
 } {Grl}
 .t tag delete elide
@@ -1491,7 +1491,7 @@ test text-20.34 {TextSearchCmd procedure, firstChar and lastChar} {
 test text-20.35 {TextSearchCmd procedure, firstChar and lastChar} {
     .t search {} end
 } {1.0}
-test text-20.36 {TextSearchCmd procedure, regexp finds empty lines} {
+test text-20.35a {TextSearchCmd procedure, regexp finds empty lines} {
     # Test for fix of bug #1643
     .t insert end "\n"
     tk::TextSetCursor .t 4.0
@@ -2415,7 +2415,7 @@ test text-20.142 {TextSearchCmd, backward regexp search no-overlaps} {
     .t2 search -regexp -backward -all "foo\nbar\nfoo" end
 } {5.0 1.0}
 
-test text-20.142 {TextSearchCmd, backward regexp search no-overlaps} {
+test text-20.142a {TextSearchCmd, backward regexp search no-overlaps} {
     deleteWindows
     pack [text .t2]
     .t2 insert 1.0 " aasda asdj werwer"
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 4515fa6..d0bb9a8 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textDisp.test,v 1.32 2004/11/22 17:54:32 vincentdarley Exp $
+# RCS: @(#) $Id: textDisp.test,v 1.33 2004/12/04 00:04:41 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -2347,7 +2347,7 @@ test textDisp-19.11.15 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag add elide "16.0 +1displaylines" "16.0 +2displaylines"
     .t count -displaylines 16.0 "16.0 +4displaylines -1c"
 } {3}
-test textDisp-19.11.15 {TextWidgetCmd procedure, "count -displaylines"} {
+test textDisp-19.11.15a {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "16.0 +1displaylines" "16.0 +2displaylines"
     .t count -displaylines 16.0 "16.0 +4displaylines"
diff --git a/tests/textTag.test b/tests/textTag.test
index b3ef1fc..ac5101a 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textTag.test,v 1.11 2004/06/17 22:38:57 dkf Exp $
+# RCS: @(#) $Id: textTag.test,v 1.12 2004/12/04 00:04:42 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -183,7 +183,7 @@ test textTag-3.7 {TkTextTagCmd - "bind" option} haveCourier12 {
     .t tag bind x <Enter>
 } {script1
 script2}
-test textTag-3.7 {TkTextTagCmd - "bind" option} haveCourier12 {
+test textTag-3.7a {TkTextTagCmd - "bind" option} haveCourier12 {
     .t tag delete x
     list [catch {.t tag bind x <Enter>} msg] $msg
 } {0 {}}
diff --git a/tests/textWind.test b/tests/textWind.test
index 8cea3ad..0fbd84f 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textWind.test,v 1.18 2004/09/10 12:13:43 vincentdarley Exp $
+# RCS: @(#) $Id: textWind.test,v 1.19 2004/12/04 00:04:42 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -980,7 +980,7 @@ test textWind-17.8 {peer widget window configuration} {
     set res
 } {{-window {} {} {} .t.f} {-window {} {} {} {}}}
 
-test textWind-17.8 {peer widget window configuration} {
+test textWind-17.8a {peer widget window configuration} {
     catch {destroy .t .tt}
     pack [text .t]
     .t delete 1.0 end
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 214df36..779746f 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixEmbed.test,v 1.13 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: unixEmbed.test,v 1.14 2004/12/04 00:04:42 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -199,7 +199,7 @@ test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} unix {
     update
     wm geometry .t2
 } {200x200+0+0}
-test unixEmbed-3.2 {ContainerEventProc procedure, disallow position changes} unix {
+test unixEmbed-3.2a {ContainerEventProc procedure, disallow position changes} unix {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
diff --git a/tests/winFont.test b/tests/winFont.test
index eec223e..82d0c36 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winFont.test,v 1.10 2004/06/24 12:45:44 dkf Exp $
+# RCS: @(#) $Id: winFont.test,v 1.11 2004/12/04 00:04:43 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -145,7 +145,7 @@ test winfont-5.10 {Tk_MeasureChars procedure: make first part of word fit} win {
     .b.l config -wrap [expr $ax*12] -text "0000000000000000"
     getsize
 } "[expr $ax*12] [expr $ay*2]"
-test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} \
+test winfont-5.11 {Tk_MeasureChars procedure: check for kerning} \
 	{win nonPortable} {
     set font [.b.l cget -font]
     .b.l config -font {{MS Sans Serif} 8} -text "W"
@@ -155,6 +155,7 @@ test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} \
     .b.l config -font $font
     expr $x < ($width*10)
 } 1
+
 test winfont-6.1 {Tk_DrawChars procedure: loop test} win {
     .b.l config -text "a"
     update
diff --git a/tests/winSend.test b/tests/winSend.test
index 089ea85..721dd8a 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winSend.test,v 1.6 2004/05/23 17:34:50 dkf Exp $
+# RCS: @(#) $Id: winSend.test,v 1.7 2004/12/04 00:04:43 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -99,16 +99,16 @@ test winSend-1.6 {Tk_SetAppName - safe interps} winSend {
 test winSend-2.1 {Tk_SendObjCmd - # of args} winSend {
     list [catch {send tktest} msg] $msg
 } {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
-test winSend-2.1 {Tk_SendObjCmd: arguments} winSend {
+test winSend-2.1a {Tk_SendObjCmd: arguments} winSend {
     list [catch {send -bogus tktest} msg] $msg
 } {1 {bad option "-bogus": must be -async, -displayof, or --}}
-test winSend-2.1 {Tk_SendObjCmd: arguments} winSend {
+test winSend-2.1b {Tk_SendObjCmd: arguments} winSend {
     list [catch {send -async bogus foo} msg] $msg
 } {1 {no registered server named "bogus"}}
-test winSend-2.1 {Tk_SendObjCmd: arguments} winSend {
+test winSend-2.1c {Tk_SendObjCmd: arguments} winSend {
     list [catch {send -displayof . bogus foo} msg] $msg
 } {1 {no registered server named "bogus"}}
-test winSend-2.1 {Tk_SendObjCmd: arguments} winSend {
+test winSend-2.1d {Tk_SendObjCmd: arguments} winSend {
     list [catch {send -- -bogus foo} msg] $msg
 } {1 {no registered server named "-bogus"}}
 test winSend-2.2 {Tk_SendObjCmd - sending to ourselves} winSend {
diff --git a/tests/winWm.test b/tests/winWm.test
index 03771a5..f1449e4 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -9,7 +9,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winWm.test,v 1.14 2004/10/05 22:04:46 hobbs Exp $
+# RCS: @(#) $Id: winWm.test,v 1.15 2004/12/04 00:04:43 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -113,7 +113,7 @@ test winWm-2.2 {TkpWmSetState} win {
     destroy .t
     set result
 } {normal withdrawn iconic normal}
-test winWm-2.2 {TkpWmSetState} win {
+test winWm-2.3 {TkpWmSetState} win {
     toplevel .t
     wm geometry .t 150x50+10+10
     update