merged tcl 8.1 branch back into the main trunk

1 files changed, 22 insertions, 4 deletions

diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index 661caa4..ad18e70 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -8,20 +8,24 @@
 #
 # Copyright (c) 1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 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: cmdInfo.test,v 1.2 1998/09/14 18:40:08 stanton Exp $
+# RCS: @(#) $Id: cmdInfo.test,v 1.3 1999/04/16 00:47:24 stanton Exp $
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 if {[info commands testcmdinfo] == {}} {
     puts "This application hasn't been compiled with the \"testcmdinfo\""
     puts "command, so I can't test Tcl_GetCommandInfo etc."
+    ::tcltest::cleanupTests
     return
 }
 
-if {[string compare test [info procs test]] == 1} then {source defs}
-
 test cmdinfo-1.1 {command procedure and clientData} {
     testcmdinfo create x1
     testcmdinfo get x1
@@ -93,6 +97,20 @@ test cmdinfo-6.1 {Names for commands created when outside namespaces} {
     eval lappend y [testcmdtoken name $x]
 } {testCmd ::cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2 ::newTestCmd2}
 
+# cleanup
 catch {namespace delete cmdInfoNs1::cmdInfoNs2 cmdInfoNs1}
 catch {rename x1 ""}
-concat {}
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+