merged tcl 8.1 branch back into the main trunk

1 files changed, 18 insertions, 4 deletions

diff --git a/tests/rename.test b/tests/rename.test
index 5f0d733..14cdf05 100644
--- a/tests/rename.test
+++ b/tests/rename.test
@@ -6,13 +6,16 @@
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
 #
 # 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.2 1998/09/14 18:40:13 stanton Exp $
+# RCS: @(#) $Id: rename.test,v 1.3 1999/04/16 00:47:33 stanton Exp $
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 # Must eliminate the "unknown" command while the test is running,
 # especially if the test is being run in a program with its
@@ -163,10 +166,21 @@ test rename-6.1 {old code invalidated (epoch incremented) when cmd with compile
     set msg
 } {called "incr" with too many arguments}
 
+# cleanup
 catch {rename incr {}}
 catch {rename incr.old incr}
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
 
-# Make the file return an empty string (cleaner.).
 
-set x ""