merged tcl 8.1 branch back into the main trunk

1 files changed, 23 insertions, 3 deletions

diff --git a/tests/dcall.test b/tests/dcall.test
index 6cd4908..2114071 100644
--- a/tests/dcall.test
+++ b/tests/dcall.test
@@ -6,20 +6,24 @@
 #
 # Copyright (c) 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: dcall.test,v 1.2 1998/09/14 18:40:08 stanton Exp $
+# RCS: @(#) $Id: dcall.test,v 1.3 1999/04/16 00:47:25 stanton Exp $
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 if {[info commands testdcall] == {}} {
     puts "This application hasn't been compiled with the \"testdcall\""
     puts "command, so I can't test Tcl_CallWhenDeleted."
+    ::tcltest::cleanupTests
     return
 }
 
-if {[string compare test [info procs test]] == 1} then {source defs}
-
 test dcall-1.1 {deletion callbacks} {
     lsort -increasing [testdcall 1 2 3]
 } {1 2 3}
@@ -38,3 +42,19 @@ test dcall-1.5 {deletion callbacks} {
 test dcall-1.6 {deletion callbacks} {
     lsort -increasing [testdcall 20 21 22 -21 -22 -20]
 } {}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+