* tests/clock.test: Correct duplicate test names.

        * tests/namespace.test:
        * tests/string.test:
        * tests/io.test (io-50.4):      Use namespace variables.

5 files changed, 20 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index e3a4129..498e864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-27  Don Porter  <dgp@users.sourceforge.net>
+
+	* tests/clock.test:	Correct duplicate test names.
+	* tests/namespace.test:
+	* tests/string.test:
+
+	* tests/io.test (io-50.4):	Use namespace variables.
+
 2004-10-27  David Gravereaux <davygrvy@pobox.com>
 
 	* generic/tclInt.decls:	  The following 9 functions were moved from
diff --git a/tests/clock.test b/tests/clock.test
index 79f1970..746e26a 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: clock.test,v 1.48 2004/10/26 02:08:39 kennykb Exp $
+# RCS: @(#) $Id: clock.test,v 1.49 2004/10/28 00:04:33 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -18058,7 +18058,7 @@ test clock-7.3 {Julian Day} {
 	-format %Y-%m-%d -gmt true
 } 2000-01-01
 
-test clock-7.3 {Julian Day} {
+test clock-7.3.1 {Julian Day} {
     clock format [clock scan 2488070 -format %J -gmt true] \
 	-format %Y-%m-%d -gmt true
 } 2100-01-01
@@ -34652,14 +34652,14 @@ test clock-30.23 {clock add seconds} {
     set x2 [clock format $f2 -format {%Y-%m-%d %H:%M:%S} -timezone :UTC]
     list $x1 $x2
 } {{2000-01-01 13:34:56} {2000-01-01 11:34:56}}
-test clock-30.21 {clock add seconds at DST conversion} {
+test clock-30.24 {clock add seconds at DST conversion} {
     set t [clock scan {2004-04-04 01:00:00 -0500} \
 	       -format {%Y-%m-%d %H:%M:%S %z} \
 	       -timezone EST5EDT]
     set f1 [clock add $t 3600 seconds -timezone EST5EDT]
     set x1 [clock format $f1 -format {%Y-%m-%d %H:%M:%S %z} -timezone EST5EDT]
 } {2004-04-04 03:00:00 -0400}
-test clock-30.22 {clock add seconds at DST conversion} {
+test clock-30.25 {clock add seconds at DST conversion} {
     set t [clock scan {2004-10-31 01:00:00 -0400} \
 	       -format {%Y-%m-%d %H:%M:%S %z} \
 	       -timezone EST5EDT]
diff --git a/tests/io.test b/tests/io.test
index 8f881b4..0ce6246 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: io.test,v 1.60 2004/07/25 22:06:21 patthoyts Exp $
+# RCS: @(#) $Id: io.test,v 1.61 2004/10/28 00:04:39 dgp Exp $
 
 if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
@@ -6292,8 +6292,8 @@ test io-50.4 {testing handler deletion vs reentrant calls} {testchannelevent} {
 	    update
 	}
     }
-    set u toplevel
-    set z ""
+    variable u toplevel
+    variable z ""
     update
     close $f
     string compare [string tolower $z] \
diff --git a/tests/namespace.test b/tests/namespace.test
index cc31389..4180ca5 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: namespace.test,v 1.41 2004/10/22 15:46:37 dkf Exp $
+# RCS: @(#) $Id: namespace.test,v 1.42 2004/10/28 00:04:39 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -432,7 +432,7 @@ test namespace-10.8 {Tcl_ForgetImport: Bug 560297} -setup {
     namespace delete origin link link2 my
 }
 
-test namespace-10.8 {Tcl_ForgetImport: Bug 560297} -setup {
+test namespace-10.9 {Tcl_ForgetImport: Bug 560297} -setup {
     namespace eval origin {
 	namespace export cmd
 	proc cmd {} {}
diff --git a/tests/string.test b/tests/string.test
index b80d223..c715603 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: string.test,v 1.42 2004/08/30 18:06:34 dkf Exp $
+# RCS: @(#) $Id: string.test,v 1.43 2004/10/28 00:04:39 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -649,7 +649,7 @@ test string-6.105 {string is wideinteger, false on bad octal} {
 test string-6.106 {string is wideinteger, false on bad hex} {
     list [string is wideinteger -fail var 0X345XYZ] $var
 } {0 5}
-test string-6.105 {string is integer, bad integers} {
+test string-6.107 {string is integer, bad integers} {
     # SF bug #634856
     set result ""
     set numbers [list 1 +1 ++1 +-1 -+1 -1 --1 "- +1"]
@@ -1394,4 +1394,4 @@ return
 
 # Local Variables:
 # mode: tcl
-# End:
\ No newline at end of file
+# End: