merged tcl 8.1 branch back into the main trunk

1 files changed, 23 insertions, 5 deletions

diff --git a/tests/pid.test b/tests/pid.test
index c93237f..3f8275b 100644
--- a/tests/pid.test
+++ b/tests/pid.test
@@ -6,21 +6,25 @@
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1995 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: pid.test,v 1.2 1998/09/14 18:40:12 stanton Exp $
+# RCS: @(#) $Id: pid.test,v 1.3 1999/04/16 00:47:32 stanton Exp $
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 # If pid is not defined just return with no error
 # Some platforms may not have the pid command implemented
 if {[info commands pid] == ""} {
     puts "pid is not implemented for this machine"
+    ::tcltest::cleanupTests
     return
 }
 
-if {[string compare test [info procs test]] == 1} then {source defs}
-
 catch {removeFile test1}
 
 test pid-1.1 {pid command} {
@@ -48,5 +52,19 @@ test pid-1.5 {pid command} {
     list [catch {pid gorp} msg] $msg
 } {1 {can not find channel named "gorp"}}
 
-catch {removeFile test1}
-concat {}
+# cleanup
+catch {::tcltest::removeFile test1}
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+