merged tcl 8.1 branch back into the main trunk

1 files changed, 23 insertions, 5 deletions

diff --git a/tests/trace.test b/tests/trace.test
index c0faa35..a2dd45e 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -6,13 +6,16 @@
 #
 # Copyright (c) 1991-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: trace.test,v 1.2 1998/09/14 18:40:14 stanton Exp $
+# RCS: @(#) $Id: trace.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 proc traceScalar {name1 name2 op} {
     global info
@@ -610,10 +613,10 @@ test trace-12.1 {delete one trace from another} {
 
 test trace-13.1 {trace command (overall)} {
     list [catch {trace} msg] $msg
-} {1 {too few args: should be "trace option [arg arg ...]"}}
+} {1 {wrong # args: should be "trace option [arg arg ...]"}}
 test trace-13.2 {trace command (overall)} {
     list [catch {trace gorp} msg] $msg
-} {1 {bad option "gorp": should be variable, vdelete, or vinfo}}
+} {1 {bad option "gorp": must be variable, vdelete, or vinfo}}
 test trace-13.3 {trace command ("variable" option)} {
     list [catch {trace variable x y} msg] $msg
 } {1 {wrong # args: should be "trace variable name ops command"}}
@@ -963,4 +966,19 @@ test trace-17.1 {unset traces on procedure returns} {
 
 catch {unset x}
 catch {unset y}
-concat {}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+