merged tcl 8.1 branch back into the main trunk

1 files changed, 22 insertions, 2 deletions

diff --git a/tests/assocd.test b/tests/assocd.test
index 48ef00b..a618606 100644
--- a/tests/assocd.test
+++ b/tests/assocd.test
@@ -6,17 +6,21 @@
 #
 # Copyright (c) 1991-1994 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: assocd.test,v 1.2 1998/09/14 18:40:07 stanton Exp $
+# RCS: @(#) $Id: assocd.test,v 1.3 1999/04/16 00:47:23 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]
+}
 
 if {[string compare testsetassocdata [info commands testsetassocdata]] != 0} {
     puts "This application hasn't been compiled with the tests for assocData,"
     puts "therefore I am skipping all of these tests."
+    ::tcltest::cleanupTests
     return
 }
 
@@ -55,3 +59,19 @@ test assocd-3.2 {testing deleting assoc data} {
 test assocd-3.3 {testing deleting assoc data} {
    list [catch {testdelassocdata nonexistent} msg] $msg
 } {0 {}}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+