merged tcl 8.1 branch back into the main trunk

1 files changed, 21 insertions, 3 deletions

diff --git a/tests/indexObj.test b/tests/indexObj.test
index d4ae81a..979e5a8 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -3,19 +3,21 @@
 # are organized in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1997 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: indexObj.test,v 1.2 1998/09/14 18:40:10 stanton Exp $
+# RCS: @(#) $Id: indexObj.test,v 1.3 1999/04/16 00:47:29 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 {[info commands testindexobj] == {}} {
     puts "This application hasn't been compiled with the \"testindexobj\""
     puts "command, so I can't test Tcl_GetIndexFromObj etc."
+    ::tcltest::cleanupTests
     return 
 }
 
@@ -66,3 +68,19 @@ test indexObj-4.1 {free old internal representation} {
     lindex $x 1
     testindexobj 1 1 $x abc def {a b} zzz
 } {2}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+