* tests/*.test: Changed all occurances of "namespace import

::tcltest" to "namespace import -force ::tcltest" [Bug: 3948].

121 files changed, 248 insertions, 248 deletions

diff --git a/tests/all.tcl b/tests/all.tcl
index aca74f8..df5cb3d 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -7,11 +7,11 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: all.tcl,v 1.9 2000/01/27 23:44:09 jenn Exp $
+# RCS: @(#) $Id: all.tcl,v 1.10 2000/04/10 17:18:56 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set ::tcltest::testSingleFile false
diff --git a/tests/append.test b/tests/append.test
index 818ee1c..cc0d1b9 100644
--- a/tests/append.test
+++ b/tests/append.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: append.test,v 1.4 1999/06/26 03:54:09 jenn Exp $
+# RCS: @(#) $Id: append.test,v 1.5 2000/04/10 17:18:56 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 catch {unset x}
 
diff --git a/tests/assocd.test b/tests/assocd.test
index 9fc3871..34fb184 100644
--- a/tests/assocd.test
+++ b/tests/assocd.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: assocd.test,v 1.4 1999/06/26 03:54:10 jenn Exp $
+# RCS: @(#) $Id: assocd.test,v 1.5 2000/04/10 17:18:56 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[string compare testsetassocdata [info commands testsetassocdata]] != 0} {
diff --git a/tests/async.test b/tests/async.test
index 7869775..307a707 100644
--- a/tests/async.test
+++ b/tests/async.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: async.test,v 1.4 1999/06/26 03:54:10 jenn Exp $
+# RCS: @(#) $Id: async.test,v 1.5 2000/04/10 17:18:56 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testasync] == {}} {
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index c033bf0..4be6bee 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: autoMkindex.test,v 1.10 2000/01/29 00:12:46 ericm Exp $
+# RCS: @(#) $Id: autoMkindex.test,v 1.11 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # temporarily copy the autoMkindex.tcl file from testsDirectory to
diff --git a/tests/basic.test b/tests/basic.test
index 66c7551..b30f705 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -15,12 +15,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: basic.test,v 1.9 1999/10/19 18:08:44 jenn Exp $
+# RCS: @(#) $Id: basic.test,v 1.10 2000/04/10 17:18:57 ericm Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {namespace delete test_ns_basic}
diff --git a/tests/binary.test b/tests/binary.test
index a44da4d..07790a2 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: binary.test,v 1.6 1999/06/28 23:49:31 redman Exp $
+# RCS: @(#) $Id: binary.test,v 1.7 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test binary-2.1 {DupByteArrayInternalRep} {
diff --git a/tests/case.test b/tests/case.test
index 838def9..997cecb 100644
--- a/tests/case.test
+++ b/tests/case.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: case.test,v 1.4 1999/06/26 03:54:10 jenn Exp $
+# RCS: @(#) $Id: case.test,v 1.5 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test case-1.1 {simple pattern} {
diff --git a/tests/clock.test b/tests/clock.test
index 94c74bd..926ac1c 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -10,11 +10,11 @@
 # 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.12 2000/03/21 22:55:24 ericm Exp $
+# RCS: @(#) $Id: clock.test,v 1.13 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test clock-1.1 {clock tests} {
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 58bb728..68e4255 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: cmdAH.test,v 1.9 1999/10/29 03:04:37 hobbs Exp $
+# RCS: @(#) $Id: cmdAH.test,v 1.10 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 global env
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 34d44df..b4b23f0 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: cmdIL.test,v 1.11 2000/01/13 20:33:10 ericm Exp $
+# RCS: @(#) $Id: cmdIL.test,v 1.12 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test cmdIL-1.1 {Tcl_LsortObjCmd procedure} {
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index 8802c9c..1e70bd2 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: cmdInfo.test,v 1.4 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: cmdInfo.test,v 1.5 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testcmdinfo] == {}} {
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index d97c5da..f3f562e 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: cmdMZ.test,v 1.6 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: cmdMZ.test,v 1.7 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Tcl_PwdObjCmd
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index decf320..f7bb24f 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: compExpr-old.test,v 1.4 1999/06/30 00:17:07 jenn Exp $
+# RCS: @(#) $Id: compExpr-old.test,v 1.5 2000/04/10 17:18:57 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
diff --git a/tests/compExpr.test b/tests/compExpr.test
index 0a1404d..fed14c9 100644
--- a/tests/compExpr.test
+++ b/tests/compExpr.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: compExpr.test,v 1.3 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: compExpr.test,v 1.4 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
diff --git a/tests/compile.test b/tests/compile.test
index da70c8c..e231ffe 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: compile.test,v 1.7 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: compile.test,v 1.8 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # The following tests are very incomplete, although the rest of the
diff --git a/tests/concat.test b/tests/concat.test
index ad9a4c4..0debbd5 100644
--- a/tests/concat.test
+++ b/tests/concat.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: concat.test,v 1.4 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: concat.test,v 1.5 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test concat-1.1 {simple concatenation} {
diff --git a/tests/dcall.test b/tests/dcall.test
index d15b537..83aaba1 100644
--- a/tests/dcall.test
+++ b/tests/dcall.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: dcall.test,v 1.4 1999/06/26 03:54:11 jenn Exp $
+# RCS: @(#) $Id: dcall.test,v 1.5 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testdcall] == {}} {
diff --git a/tests/dstring.test b/tests/dstring.test
index afa3b4e..6c9276b 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: dstring.test,v 1.4 1999/06/26 03:54:12 jenn Exp $
+# RCS: @(#) $Id: dstring.test,v 1.5 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testdstring] == {}} {
diff --git a/tests/encoding.test b/tests/encoding.test
index bd45f15..21c53b0 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: encoding.test,v 1.7 1999/10/13 00:32:29 hobbs Exp $
+# RCS: @(#) $Id: encoding.test,v 1.8 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc toutf {args} {
diff --git a/tests/env.test b/tests/env.test
index 99a6a89..f1e6a39 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: env.test,v 1.12 1999/12/04 06:16:48 hobbs Exp $
+# RCS: @(#) $Id: env.test,v 1.13 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 #
diff --git a/tests/error.test b/tests/error.test
index e09bbb3..e054463 100644
--- a/tests/error.test
+++ b/tests/error.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: error.test,v 1.6 1999/06/26 03:54:12 jenn Exp $
+# RCS: @(#) $Id: error.test,v 1.7 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc foo {} {
diff --git a/tests/eval.test b/tests/eval.test
index c140a05..13fc501 100644
--- a/tests/eval.test
+++ b/tests/eval.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: eval.test,v 1.4 1999/06/26 03:54:12 jenn Exp $
+# RCS: @(#) $Id: eval.test,v 1.5 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test eval-1.1 {single argument} {
diff --git a/tests/event.test b/tests/event.test
index 1366704..3f5bc2e 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: event.test,v 1.10 1999/08/27 21:45:17 jenn Exp $
+# RCS: @(#) $Id: event.test,v 1.11 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set ::tcltest::testConstraints(testfilehandler) \
diff --git a/tests/exec.test b/tests/exec.test
index 95010de..af8bf32 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: exec.test,v 1.7 2000/03/31 19:39:42 ericm Exp $
+# RCS: @(#) $Id: exec.test,v 1.8 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # All tests require the "exec" command.
diff --git a/tests/execute.test b/tests/execute.test
index d8eadea..4b11822 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -14,11 +14,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: execute.test,v 1.7 1999/07/01 17:36:18 jenn Exp $
+# RCS: @(#) $Id: execute.test,v 1.8 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {eval namespace delete [namespace children :: test_ns_*]}
diff --git a/tests/expr-old.test b/tests/expr-old.test
index ccb1438..4d44b55 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: expr-old.test,v 1.7 1999/12/04 06:16:48 hobbs Exp $
+# RCS: @(#) $Id: expr-old.test,v 1.8 2000/04/10 17:18:58 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
diff --git a/tests/expr.test b/tests/expr.test
index 58fd168..13d5583 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: expr.test,v 1.8 2000/01/12 11:13:25 hobbs Exp $
+# RCS: @(#) $Id: expr.test,v 1.9 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
diff --git a/tests/fCmd.test b/tests/fCmd.test
index ba13e27..c6cf426 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -10,12 +10,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: fCmd.test,v 1.7 2000/04/08 02:35:32 hobbs Exp $
+# RCS: @(#) $Id: fCmd.test,v 1.8 2000/04/10 17:18:59 ericm Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[string compare testgetplatform [info commands testgetplatform]] != 0} {
diff --git a/tests/fileName.test b/tests/fileName.test
index 989299b..5986136 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: fileName.test,v 1.7 2000/04/04 08:05:18 hobbs Exp $
+# RCS: @(#) $Id: fileName.test,v 1.8 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testsetplatform] == {}} {
diff --git a/tests/for-old.test b/tests/for-old.test
index cee66b6..3e142f3 100644
--- a/tests/for-old.test
+++ b/tests/for-old.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: for-old.test,v 1.4 1999/06/26 03:54:13 jenn Exp $
+# RCS: @(#) $Id: for-old.test,v 1.5 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Check "for" and its use of continue and break.
diff --git a/tests/for.test b/tests/for.test
index bdffa15..fe36719 100644
--- a/tests/for.test
+++ b/tests/for.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: for.test,v 1.5 1999/06/26 03:54:13 jenn Exp $
+# RCS: @(#) $Id: for.test,v 1.6 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Basic "for" operation.
diff --git a/tests/foreach.test b/tests/foreach.test
index 5f122a9..4b2a9da 100644
--- a/tests/foreach.test
+++ b/tests/foreach.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: foreach.test,v 1.5 2000/04/04 08:05:18 hobbs Exp $
+# RCS: @(#) $Id: foreach.test,v 1.6 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset a}
diff --git a/tests/format.test b/tests/format.test
index 3d3b88e..8061832 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: format.test,v 1.7 1999/09/21 04:20:44 hobbs Exp $
+# RCS: @(#) $Id: format.test,v 1.8 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # The following code is needed because some versions of SCO Unix have
diff --git a/tests/get.test b/tests/get.test
index 45dd5d6..946e4c6 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: get.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: get.test,v 1.5 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test get-1.1 {Tcl_GetInt procedure} {
diff --git a/tests/history.test b/tests/history.test
index 76117f6..c18ef53 100644
--- a/tests/history.test
+++ b/tests/history.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: history.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: history.test,v 1.5 2000/04/10 17:18:59 ericm Exp $
   
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[catch {history}]} {
diff --git a/tests/http.test b/tests/http.test
index 4ae5757..a7c1045 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -12,11 +12,11 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.17 2000/04/09 23:56:31 welch Exp $
+# RCS: @(#) $Id: http.test,v 1.18 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 set tcltest::testConstraints(notLinux) \
 	[expr ![string equal Linux $tcl_platform(os)]]
diff --git a/tests/httpold.test b/tests/httpold.test
index f6d02f4..42e326b 100644
--- a/tests/httpold.test
+++ b/tests/httpold.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: httpold.test,v 1.7 2000/02/05 12:37:59 hobbs Exp $
+# RCS: @(#) $Id: httpold.test,v 1.8 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[catch {package require http 1.0}]} {
diff --git a/tests/if-old.test b/tests/if-old.test
index 767d088..f0b977b 100644
--- a/tests/if-old.test
+++ b/tests/if-old.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: if-old.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: if-old.test,v 1.5 2000/04/10 17:18:59 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test if-old-1.1 {taking proper branch} {
diff --git a/tests/if.test b/tests/if.test
index cc3bb77..b6ea1e3 100644
--- a/tests/if.test
+++ b/tests/if.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: if.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: if.test,v 1.5 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Basic "if" operation.
diff --git a/tests/incr-old.test b/tests/incr-old.test
index 789daa5..0344c42 100644
--- a/tests/incr-old.test
+++ b/tests/incr-old.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: incr-old.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: incr-old.test,v 1.5 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset x}
diff --git a/tests/incr.test b/tests/incr.test
index 046e9ad..f3ea408 100644
--- a/tests/incr.test
+++ b/tests/incr.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: incr.test,v 1.5 1999/10/29 03:04:37 hobbs Exp $
+# RCS: @(#) $Id: incr.test,v 1.6 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Basic "incr" operation.
diff --git a/tests/indexObj.test b/tests/indexObj.test
index 9219a2c..6a69a9d 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: indexObj.test,v 1.4 1999/06/26 03:54:14 jenn Exp $
+# RCS: @(#) $Id: indexObj.test,v 1.5 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testindexobj] == {}} {
diff --git a/tests/info.test b/tests/info.test
index f8fdd43..d5a29a7 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: info.test,v 1.14 2000/01/21 03:40:04 hobbs Exp $
+# RCS: @(#) $Id: info.test,v 1.15 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Set up namespaces needed to test operation of "info args", "info body",
diff --git a/tests/init.test b/tests/init.test
index e9d49b9..7c5a159 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: init.test,v 1.5 1999/06/26 20:55:07 rjohnson Exp $
+# RCS: @(#) $Id: init.test,v 1.6 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Clear out any namespaces called test_ns_*
@@ -63,7 +63,7 @@ test init-1.8 {auto_qualify - multiple colons 2} {
 set testInterp [interp create]
 interp eval $testInterp [list set argv $argv]
 interp eval $testInterp [list package require tcltest]
-interp eval $testInterp [list namespace import ::tcltest::*]
+interp eval $testInterp [list namespace import -force ::tcltest::*]
 
 interp eval $testInterp {
 
diff --git a/tests/interp.test b/tests/interp.test
index 91dfcb5..6cad192 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: interp.test,v 1.10 1999/08/23 17:54:59 jenn Exp $
+# RCS: @(#) $Id: interp.test,v 1.11 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # The set of hidden commands is platform dependent:
diff --git a/tests/io.test b/tests/io.test
index e225423..9c93903 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -12,11 +12,11 @@
 # 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.13 1999/12/08 03:50:12 hobbs Exp $
+# RCS: @(#) $Id: io.test,v 1.14 2000/04/10 17:19:00 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {"[info commands testchannel]" != "testchannel"} {
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 1565a0a..5655c7b 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: ioCmd.test,v 1.7 1999/07/22 00:06:10 redman Exp $
+# RCS: @(#) $Id: ioCmd.test,v 1.8 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 removeFile test1
diff --git a/tests/ioUtil.test b/tests/ioUtil.test
index 78b5094..de37cf8 100644
--- a/tests/ioUtil.test
+++ b/tests/ioUtil.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution 
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES. 
 # 
-# RCS: @(#) $Id: ioUtil.test,v 1.7 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: ioUtil.test,v 1.8 2000/04/10 17:19:01 ericm Exp $
  
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set unsetScript {
diff --git a/tests/join.test b/tests/join.test
index 2c98c40..e464103 100644
--- a/tests/join.test
+++ b/tests/join.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: join.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: join.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test join-1.1 {basic join commands} {
diff --git a/tests/lindex.test b/tests/lindex.test
index 625d8dc..ae1672c 100644
--- a/tests/lindex.test
+++ b/tests/lindex.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: lindex.test,v 1.6 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: lindex.test,v 1.7 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test lindex-1.1 {basic tests} {
diff --git a/tests/link.test b/tests/link.test
index 843333b..f64711a 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: link.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: link.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testlink] == {}} {
diff --git a/tests/linsert.test b/tests/linsert.test
index 1a1ee82..b3dcb6b 100644
--- a/tests/linsert.test
+++ b/tests/linsert.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: linsert.test,v 1.7 1999/09/21 04:20:44 hobbs Exp $
+# RCS: @(#) $Id: linsert.test,v 1.8 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset lis}
diff --git a/tests/list.test b/tests/list.test
index 54624a5..e20023e 100644
--- a/tests/list.test
+++ b/tests/list.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: list.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: list.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # First, a bunch of individual tests
diff --git a/tests/listObj.test b/tests/listObj.test
index 863122c..a240dec 100644
--- a/tests/listObj.test
+++ b/tests/listObj.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: listObj.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: listObj.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testobj] == {}} {
diff --git a/tests/llength.test b/tests/llength.test
index 0de94f4..cfd788e 100644
--- a/tests/llength.test
+++ b/tests/llength.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: llength.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: llength.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test llength-1.1 {length of list} {
diff --git a/tests/load.test b/tests/load.test
index 8bf8e0d..bb31845 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: load.test,v 1.6 1999/07/01 17:36:18 jenn Exp $
+# RCS: @(#) $Id: load.test,v 1.7 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Figure out what extension is used for shared libraries on this
diff --git a/tests/lrange.test b/tests/lrange.test
index db29efb..68e5d5e 100644
--- a/tests/lrange.test
+++ b/tests/lrange.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: lrange.test,v 1.6 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: lrange.test,v 1.7 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test lrange-1.1 {range of list elements} {
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 94d0f71..d3ca611 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: lreplace.test,v 1.6 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: lreplace.test,v 1.7 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test lreplace-1.1 {lreplace command} {
diff --git a/tests/lsearch.test b/tests/lsearch.test
index 9d4ba13..a5ba1b7 100644
--- a/tests/lsearch.test
+++ b/tests/lsearch.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: lsearch.test,v 1.4 1999/06/26 03:54:16 jenn Exp $
+# RCS: @(#) $Id: lsearch.test,v 1.5 2000/04/10 17:19:01 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set x {abcd bbcd 123 234 345}
diff --git a/tests/macFCmd.test b/tests/macFCmd.test
index 0ad77fe..52182b0 100644
--- a/tests/macFCmd.test
+++ b/tests/macFCmd.test
@@ -10,12 +10,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: macFCmd.test,v 1.6 1999/08/23 17:54:59 jenn Exp $
+# RCS: @(#) $Id: macFCmd.test,v 1.7 2000/04/10 17:19:02 ericm Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {file delete -force foo.dir}
diff --git a/tests/misc.test b/tests/misc.test
index ab5bb30..12ef1bd 100644
--- a/tests/misc.test
+++ b/tests/misc.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: misc.test,v 1.4 1999/06/26 03:54:17 jenn Exp $
+# RCS: @(#) $Id: misc.test,v 1.5 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test misc-1.1 {error in variable ref. in command in array reference} {
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 3d8b087..c9c3eca 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: msgcat.test,v 1.6 1999/07/01 17:36:18 jenn Exp $
+# RCS: @(#) $Id: msgcat.test,v 1.7 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[catch {package require msgcat 1.0}]} {
diff --git a/tests/namespace-old.test b/tests/namespace-old.test
index 2fc8ab1..42e2967 100644
--- a/tests/namespace-old.test
+++ b/tests/namespace-old.test
@@ -14,11 +14,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: namespace-old.test,v 1.4 1999/06/26 03:54:17 jenn Exp $
+# RCS: @(#) $Id: namespace-old.test,v 1.5 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Clear out any namespaces called test_ns_*
diff --git a/tests/namespace.test b/tests/namespace.test
index 3a2ef1e..26eda2d 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -11,11 +11,11 @@
 # 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.11 2000/04/04 08:05:19 hobbs Exp $
+# RCS: @(#) $Id: namespace.test,v 1.12 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Clear out any namespaces called test_ns_*
diff --git a/tests/obj.test b/tests/obj.test
index f23bf42..3fffde8 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: obj.test,v 1.4 1999/06/26 03:54:17 jenn Exp $
+# RCS: @(#) $Id: obj.test,v 1.5 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testobj] == {}} {
diff --git a/tests/opt.test b/tests/opt.test
index 552280a..f7491f1 100644
--- a/tests/opt.test
+++ b/tests/opt.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: opt.test,v 1.5 1999/06/26 03:54:18 jenn Exp $
+# RCS: @(#) $Id: opt.test,v 1.6 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # the package we are going to test
diff --git a/tests/osa.test b/tests/osa.test
index 56328ea..7a16ef1 100644
--- a/tests/osa.test
+++ b/tests/osa.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: osa.test,v 1.5 1999/07/01 17:36:19 jenn Exp $
+# RCS: @(#) $Id: osa.test,v 1.6 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Only run the test if we can load the AppleScript command
diff --git a/tests/package.test b/tests/package.test
index 2ca8c34..eb24e99 100644
--- a/tests/package.test
+++ b/tests/package.test
@@ -8,11 +8,11 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: package.test,v 1.2 2000/02/07 22:33:18 ericm Exp $
+# RCS: @(#) $Id: package.test,v 1.3 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test package-1.1 {pkg::create gives error on insufficient args} {
diff --git a/tests/parse.test b/tests/parse.test
index c8e73ab..a253a48 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parse.test,v 1.6 1999/08/12 23:14:43 stanton Exp $
+# RCS: @(#) $Id: parse.test,v 1.7 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testparser] == {}} {
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
index 8ed4046..8b2afbc 100644
--- a/tests/parseExpr.test
+++ b/tests/parseExpr.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parseExpr.test,v 1.4 1999/12/04 06:16:49 hobbs Exp $
+# RCS: @(#) $Id: parseExpr.test,v 1.5 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Note that the Tcl expression parser (tclParseExpr.c) does not check
diff --git a/tests/parseOld.test b/tests/parseOld.test
index 2f6a4b2..9a4ca0e 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parseOld.test,v 1.8 1999/12/12 02:27:04 hobbs Exp $
+# RCS: @(#) $Id: parseOld.test,v 1.9 2000/04/10 17:19:02 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc fourArgs {a b c d} {
diff --git a/tests/pid.test b/tests/pid.test
index b48b75e..cbf24ac 100644
--- a/tests/pid.test
+++ b/tests/pid.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pid.test,v 1.5 1999/06/26 20:55:09 rjohnson Exp $
+# RCS: @(#) $Id: pid.test,v 1.6 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # If pid is not defined just return with no error
diff --git a/tests/pkg.test b/tests/pkg.test
index 806a5fb..9618ed8 100644
--- a/tests/pkg.test
+++ b/tests/pkg.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pkg.test,v 1.7 1999/09/21 04:20:44 hobbs Exp $
+# RCS: @(#) $Id: pkg.test,v 1.8 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Do all this in a slave interp to avoid garbaging the
@@ -22,7 +22,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 set i [interp create]
 interp eval $i [list set argv $argv]
 interp eval $i [list package require tcltest]
-interp eval $i [list namespace import ::tcltest::*]
+interp eval $i [list namespace import -force ::tcltest::*]
 interp eval $i {
 
 eval package forget [package names]
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index cc37f4f..928d2e9 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -8,11 +8,11 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.15 2000/01/28 19:32:05 ericm Exp $
+# RCS: @(#) $Id: pkgMkIndex.test,v 1.16 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set origDir [pwd]
diff --git a/tests/platform.test b/tests/platform.test
index 30188f1..9c7dec5 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -13,7 +13,7 @@
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test platform-1.1 {TclpSetVariables: tcl_platform} {
diff --git a/tests/proc-old.test b/tests/proc-old.test
index abff6fc..f139f8c 100644
--- a/tests/proc-old.test
+++ b/tests/proc-old.test
@@ -14,11 +14,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: proc-old.test,v 1.5 1999/06/26 20:55:09 rjohnson Exp $
+# RCS: @(#) $Id: proc-old.test,v 1.6 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {rename t1 ""}
diff --git a/tests/proc.test b/tests/proc.test
index 86a9dab..e4fa1aa 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: proc.test,v 1.6 1999/06/26 20:55:09 rjohnson Exp $
+# RCS: @(#) $Id: proc.test,v 1.7 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {eval namespace delete [namespace children :: test_ns_*]}
diff --git a/tests/pwd.test b/tests/pwd.test
index be16809..8c39b4e 100644
--- a/tests/pwd.test
+++ b/tests/pwd.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pwd.test,v 1.5 1999/06/26 20:55:10 rjohnson Exp $
+# RCS: @(#) $Id: pwd.test,v 1.6 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test pwd-1.1 {simple pwd} {
diff --git a/tests/reg.test b/tests/reg.test
index 22f102f..c10f929 100644
--- a/tests/reg.test
+++ b/tests/reg.test
@@ -9,11 +9,11 @@
 #
 # Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
 #
-# RCS: @(#) $Id: reg.test,v 1.12 2000/04/10 00:26:52 hobbs Exp $
+# RCS: @(#) $Id: reg.test,v 1.13 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # All tests require the testregexp command, return if this
diff --git a/tests/regexp.test b/tests/regexp.test
index e8836bd..dfbfd38 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: regexp.test,v 1.11 2000/02/02 22:32:13 hobbs Exp $
+# RCS: @(#) $Id: regexp.test,v 1.12 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset foo}
diff --git a/tests/registry.test b/tests/registry.test
index 09a4e81..f9e7055 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -10,11 +10,11 @@
 # Copyright (c) 1997 by Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# RCS: @(#) $Id: registry.test,v 1.9 1999/07/08 03:30:12 rjohnson Exp $
+# RCS: @(#) $Id: registry.test,v 1.10 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {$tcl_platform(platform) == "windows"} {
diff --git a/tests/rename.test b/tests/rename.test
index 1c1f0f6..246dbf8 100644
--- a/tests/rename.test
+++ b/tests/rename.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: rename.test,v 1.7 1999/07/08 17:29:30 jenn Exp $
+# RCS: @(#) $Id: rename.test,v 1.8 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Must eliminate the "unknown" command while the test is running,
diff --git a/tests/resource.test b/tests/resource.test
index 43747cb..efacda0 100644
--- a/tests/resource.test
+++ b/tests/resource.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: resource.test,v 1.6 1999/06/26 20:55:11 rjohnson Exp $
+# RCS: @(#) $Id: resource.test,v 1.7 2000/04/10 17:19:03 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test resource-1.1 {resource tests} {macOnly} {
diff --git a/tests/result.test b/tests/result.test
index eb3de33..e8418e2 100644
--- a/tests/result.test
+++ b/tests/result.test
@@ -14,7 +14,7 @@
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Some tests require the testsaveresult command
diff --git a/tests/safe.test b/tests/safe.test
index 48782cf..641fe9d 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: safe.test,v 1.8 1999/07/22 23:45:52 redman Exp $
+# RCS: @(#) $Id: safe.test,v 1.9 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 foreach i [interp slaves] {
diff --git a/tests/scan.test b/tests/scan.test
index 0d8d045..2624dd2 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: scan.test,v 1.9 1999/11/30 01:43:00 hobbs Exp $
+# RCS: @(#) $Id: scan.test,v 1.10 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test scan-1.1 {BuildCharSet, CharInSet} {
diff --git a/tests/security.test b/tests/security.test
index f259c6a..79baeac 100644
--- a/tests/security.test
+++ b/tests/security.test
@@ -10,11 +10,11 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: security.test,v 1.4 1999/06/26 20:55:12 rjohnson Exp $
+# RCS: @(#) $Id: security.test,v 1.5 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # If this proc becomes invoked, then there is a bug
diff --git a/tests/set-old.test b/tests/set-old.test
index 02bc702..76ebe19 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: set-old.test,v 1.7 1999/09/21 04:20:45 hobbs Exp $
+# RCS: @(#) $Id: set-old.test,v 1.8 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc ignore args {}
diff --git a/tests/set.test b/tests/set.test
index 8392bdb..47a90d7 100644
--- a/tests/set.test
+++ b/tests/set.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: set.test,v 1.7 2000/01/21 02:26:09 hobbs Exp $
+# RCS: @(#) $Id: set.test,v 1.8 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset x}
diff --git a/tests/socket.test b/tests/socket.test
index 59a3173..ba25211 100644
--- a/tests/socket.test
+++ b/tests/socket.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.
 #
-# RCS: @(#) $Id: socket.test,v 1.13 1999/10/19 18:08:44 jenn Exp $
+# RCS: @(#) $Id: socket.test,v 1.14 2000/04/10 17:19:04 ericm Exp $
 
 # Running socket tests with a remote server:
 # ------------------------------------------
@@ -64,7 +64,7 @@
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Some tests require the testthread command
diff --git a/tests/source.test b/tests/source.test
index b245cd0..30b69a5 100644
--- a/tests/source.test
+++ b/tests/source.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: source.test,v 1.5 1999/06/26 20:55:13 rjohnson Exp $
+# RCS: @(#) $Id: source.test,v 1.6 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test source-1.1 {source command} {
diff --git a/tests/split.test b/tests/split.test
index a8f27f7..e0dfc2d 100644
--- a/tests/split.test
+++ b/tests/split.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: split.test,v 1.5 1999/06/26 20:55:13 rjohnson Exp $
+# RCS: @(#) $Id: split.test,v 1.6 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test split-1.1 {basic split commands} {
diff --git a/tests/stack.test b/tests/stack.test
index 1ea0681..19a5104 100644
--- a/tests/stack.test
+++ b/tests/stack.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: stack.test,v 1.7 1999/11/19 23:02:40 hobbs Exp $
+# RCS: @(#) $Id: stack.test,v 1.8 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Note that a failure in this test results in a crash of the executable.
diff --git a/tests/string.test b/tests/string.test
index 349cba7..0de9388 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -11,11 +11,11 @@
 # 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.22 1999/12/04 06:16:49 hobbs Exp $
+# RCS: @(#) $Id: string.test,v 1.23 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Some tests require the testobj command
diff --git a/tests/stringObj.test b/tests/stringObj.test
index cc991d3..458b2f8 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: stringObj.test,v 1.9 1999/09/02 16:26:38 hobbs Exp $
+# RCS: @(#) $Id: stringObj.test,v 1.10 2000/04/10 17:19:04 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testobj] == {}} {
diff --git a/tests/subst.test b/tests/subst.test
index 0fb07cd..b360b6f 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: subst.test,v 1.5 1999/06/26 20:55:14 rjohnson Exp $
+# RCS: @(#) $Id: subst.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test subst-1.1 {basics} {
diff --git a/tests/switch.test b/tests/switch.test
index 4b7101e..6f5b9c2 100644
--- a/tests/switch.test
+++ b/tests/switch.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: switch.test,v 1.5 1999/06/26 20:55:14 rjohnson Exp $
+# RCS: @(#) $Id: switch.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test switch-1.1 {simple patterns} {
diff --git a/tests/tcltest.test b/tests/tcltest.test
index b5d2b72..322ae35 100755
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -10,16 +10,16 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: tcltest.test,v 1.9 1999/10/19 18:08:44 jenn Exp $
+# RCS: @(#) $Id: tcltest.test,v 1.10 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
     test a-1.0 {test a} {
 	list 0
     } {0}
@@ -148,7 +148,7 @@ test tcltest-5.1 {tcltest -constraints 'knownBug'} {unixOrPc} {
 
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
     puts $::tcltest::outputChannel "a test"
     ::tcltest::PrintError "a really short string"
     ::tcltest::PrintError "a really really really really really really long \
@@ -216,7 +216,7 @@ test tcltest-7.5 {tcltest test.tcl -d 3} {unixOrPc} {
 
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
     makeFile {} a.tmp
     exit
 } a.tcl
@@ -314,7 +314,7 @@ test tcltest-9.2 {-file a*.tcl} {unixOrPc} {
 
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 
     test makecore {make a core file} {
 	set f [open core w]
@@ -350,7 +350,7 @@ test tcltest-10.4 {-preservecore 3} {unixOrPc} {
 
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
     puts "=$::tcltest::parameters="
     exit
 } args.tcl
@@ -374,7 +374,7 @@ test tcltest-11.3 {-args {-foo bar -baz}} {unixOrPc} {
 # -load -loadfile
 makeFile {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
     puts $::tcltest::loadScript
     exit
 } load.tcl
diff --git a/tests/thread.test b/tests/thread.test
index ae405e5..5a138e4 100644
--- a/tests/thread.test
+++ b/tests/thread.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: thread.test,v 1.8 1999/10/21 02:17:58 hobbs Exp $
+# RCS: @(#) $Id: thread.test,v 1.9 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Some tests require the testthread command
diff --git a/tests/timer.test b/tests/timer.test
index b9ed530..2b9c9c5 100644
--- a/tests/timer.test
+++ b/tests/timer.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: timer.test,v 1.6 1999/09/21 04:20:45 hobbs Exp $
+# RCS: @(#) $Id: timer.test,v 1.7 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test timer-1.1 {Tcl_CreateTimerHandler procedure} {
diff --git a/tests/trace.test b/tests/trace.test
index 8bc0afe..35494bc 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: trace.test,v 1.5 1999/06/26 20:55:15 rjohnson Exp $
+# RCS: @(#) $Id: trace.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc traceScalar {name1 name2 op} {
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
index 79b63dd..7a388c8 100644
--- a/tests/unixFCmd.test
+++ b/tests/unixFCmd.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: unixFCmd.test,v 1.10 2000/01/12 11:13:25 hobbs Exp $
+# RCS: @(#) $Id: unixFCmd.test,v 1.11 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Several tests require need to match results against the unix username
diff --git a/tests/unixFile.test b/tests/unixFile.test
index c8810bd..c046e71 100644
--- a/tests/unixFile.test
+++ b/tests/unixFile.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: unixFile.test,v 1.5 1999/06/26 20:55:15 rjohnson Exp $
+# RCS: @(#) $Id: unixFile.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testobj] == {}} {
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 7007ae7..746114c 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: unixInit.test,v 1.12 2000/02/10 08:55:22 hobbs Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.13 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info exists env(TCL_LIBRARY)]} {
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
index 2552d2a..a12a27e 100644
--- a/tests/unixNotfy.test
+++ b/tests/unixNotfy.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.
 #
-# RCS: @(#) $Id: unixNotfy.test,v 1.8 1999/10/19 18:08:44 jenn Exp $
+# RCS: @(#) $Id: unixNotfy.test,v 1.9 2000/04/10 17:19:05 ericm Exp $
 
 # The tests should not be run if you have a notifier which is unable to
 # detect infinite vwaits, as the tests below will hang. The presence of
@@ -18,7 +18,7 @@
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info exists tk_version]} {
diff --git a/tests/unknown.test b/tests/unknown.test
index cb9de8a..5573b81 100644
--- a/tests/unknown.test
+++ b/tests/unknown.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: unknown.test,v 1.5 1999/06/26 20:55:16 rjohnson Exp $
+# RCS: @(#) $Id: unknown.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset x}
diff --git a/tests/uplevel.test b/tests/uplevel.test
index 6031586..3bebc76 100644
--- a/tests/uplevel.test
+++ b/tests/uplevel.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: uplevel.test,v 1.5 1999/06/26 20:55:17 rjohnson Exp $
+# RCS: @(#) $Id: uplevel.test,v 1.6 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc a {x y} {
diff --git a/tests/upvar.test b/tests/upvar.test
index 75984da..ad8fe6c 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -11,11 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: upvar.test,v 1.6 1999/06/26 20:55:17 rjohnson Exp $
+# RCS: @(#) $Id: upvar.test,v 1.7 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test upvar-1.1 {reading variables with upvar} {
diff --git a/tests/utf.test b/tests/utf.test
index 6c8ee89..7ac3ee2 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -8,11 +8,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: utf.test,v 1.6 2000/01/12 11:13:26 hobbs Exp $
+# RCS: @(#) $Id: utf.test,v 1.7 2000/04/10 17:19:05 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {unset x}
diff --git a/tests/util.test b/tests/util.test
index 416320a..93962d0 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -7,11 +7,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: util.test,v 1.6 1999/06/26 20:55:17 rjohnson Exp $
+# RCS: @(#) $Id: util.test,v 1.7 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {[info commands testobj] == {}} {
diff --git a/tests/var.test b/tests/var.test
index d7496f6..fb378ae 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -14,12 +14,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: var.test,v 1.14 2000/04/04 08:05:19 hobbs Exp $
+# RCS: @(#) $Id: var.test,v 1.15 2000/04/10 17:19:06 ericm Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 catch {rename p ""}
diff --git a/tests/while-old.test b/tests/while-old.test
index 0e9e474..1ea7641 100644
--- a/tests/while-old.test
+++ b/tests/while-old.test
@@ -13,11 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: while-old.test,v 1.5 1999/06/26 20:55:18 rjohnson Exp $
+# RCS: @(#) $Id: while-old.test,v 1.6 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test while-old-1.1 {basic while loops} {
diff --git a/tests/while.test b/tests/while.test
index 83b2f8a..f34bf64 100644
--- a/tests/while.test
+++ b/tests/while.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: while.test,v 1.5 1999/06/26 20:55:18 rjohnson Exp $
+# RCS: @(#) $Id: while.test,v 1.6 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # Basic "while" operation.
diff --git a/tests/winConsole.test b/tests/winConsole.test
index 197c8b1..81ddb54 100644
--- a/tests/winConsole.test
+++ b/tests/winConsole.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winConsole.test,v 1.4 1999/06/26 20:55:18 rjohnson Exp $
+# RCS: @(#) $Id: winConsole.test,v 1.5 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 
diff --git a/tests/winDde.test b/tests/winDde.test
index e160ce2..7a8bb01 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -9,11 +9,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winDde.test,v 1.7 1999/06/29 03:22:06 jenn Exp $
+# RCS: @(#) $Id: winDde.test,v 1.8 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 if {$tcl_platform(platform) == "windows"} {
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 61dc707..97fc2d5 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -10,12 +10,12 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winFCmd.test,v 1.8 1999/07/27 01:42:24 redman Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.9 2000/04/10 17:19:06 ericm Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 proc createfile {file {string a}} {
diff --git a/tests/winFile.test b/tests/winFile.test
index 09889c7..92c28a8 100644
--- a/tests/winFile.test
+++ b/tests/winFile.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winFile.test,v 1.5 1999/06/26 20:55:19 rjohnson Exp $
+# RCS: @(#) $Id: winFile.test,v 1.6 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 test winFile-1.1 {TclpGetUserHome} {pcOnly} {
diff --git a/tests/winNotify.test b/tests/winNotify.test
index 164108c..ea066e7 100644
--- a/tests/winNotify.test
+++ b/tests/winNotify.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winNotify.test,v 1.6 1999/07/01 17:36:20 jenn Exp $
+# RCS: @(#) $Id: winNotify.test,v 1.7 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set ::tcltest::testConstraints(testeventloop) \
diff --git a/tests/winPipe.test b/tests/winPipe.test
index df557c8..8cfda55 100644
--- a/tests/winPipe.test
+++ b/tests/winPipe.test
@@ -12,11 +12,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winPipe.test,v 1.11 1999/07/01 17:36:20 jenn Exp $
+# RCS: @(#) $Id: winPipe.test,v 1.12 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 set bindir [file join [pwd] [file dirname [info nameofexecutable]]]
diff --git a/tests/winTime.test b/tests/winTime.test
index bc857eb..6bcb4b7 100644
--- a/tests/winTime.test
+++ b/tests/winTime.test
@@ -10,11 +10,11 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winTime.test,v 1.4 1999/06/26 20:55:21 rjohnson Exp $
+# RCS: @(#) $Id: winTime.test,v 1.5 2000/04/10 17:19:06 ericm Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
-    namespace import ::tcltest::*
+    namespace import -force ::tcltest::*
 }
 
 # The next two tests will crash on Windows if the check for negative