merged tcl 8.1 branch back into the main trunk

1 files changed, 23 insertions, 3 deletions

diff --git a/tests/stringObj.test b/tests/stringObj.test
index bcfbe0c..33100e5 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -7,20 +7,24 @@
 # errors. No output means no errors were found.
 #
 # Copyright (c) 1995-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: stringObj.test,v 1.2 1998/09/14 18:40:14 stanton Exp $
+# RCS: @(#) $Id: stringObj.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 if {[info commands testobj] == {}} {
     puts "This application hasn't been compiled with the \"testobj\""
     puts "command, so I can't test the Tcl type and object support."
+    ::tcltest::cleanupTests
     return
 }
 
-if {[string compare test [info procs test]] == 1} then {source defs}
-
 test stringObj-1.1 {string type registration} {
     set t [testobj types]
     set first [string first "string" $t]
@@ -187,3 +191,19 @@ test stringObj-8.1 {DupStringInternalRep procedure} {
 } {5 10 5 5 abcde}
 
 testobj freeallvars
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+