* Merged 8.1 branch into the main trunk

1 files changed, 23 insertions, 6 deletions

diff --git a/tests/id.test b/tests/id.test
index b1c2ea9..8c12a50 100644
--- a/tests/id.test
+++ b/tests/id.test
@@ -3,19 +3,19 @@
 # the standard fashion for Tcl tests.
 #
 # Copyright (c) 1995 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+# All rights reserved.
 #
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: id.test,v 1.3 1998/09/14 18:23:47 stanton Exp $
+# RCS: @(#) $Id: id.test,v 1.4 1999/04/16 01:51:38 stanton Exp $
 
-if {[info procs test] != "test"} {
-    source defs
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
 if {[string compare testwrapper [info commands testwrapper]] != 0} {
     puts "This application hasn't been compiled with the testwrapper command,"
     puts "therefore I am skipping all of these tests."
+    ::tcltest::cleanupTests
     return
 }
 
@@ -100,3 +100,20 @@ test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly} {
     lappend result [lsort $reused] [lsort $x]
 } {{.f .f.a .f.b .f.c .f.d .f.e .f.f .f.g .f.h .f.i .f.j .f.k .f.l .f.m .f.n .f.o .f.p .f.q} {} {} {.f.o .f.p .f.q wrapper.f.p wrapper.f.q} {}}
 bind all <Destroy> {}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+
+