merged tcl 8.1 branch back into the main trunk

1 files changed, 22 insertions, 3 deletions

diff --git a/tests/subst.test b/tests/subst.test
index 3378756..51546d2 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -6,13 +6,16 @@
 #
 # Copyright (c) 1994 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: subst.test,v 1.2 1998/09/14 18:40:14 stanton Exp $
+# RCS: @(#) $Id: subst.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]
+}
 
 test subst-1.1 {basics} {
     list [catch {subst} msg] $msg
@@ -84,7 +87,7 @@ test subst-7.1 {switches} {
 } {1 {wrong # args: should be "subst ?-nobackslashes? ?-nocommands? ?-novariables? string"}}
 test subst-7.2 {switches} {
     list [catch {subst -no bar} msg] $msg
-} {1 {bad switch "-no": must be -nobackslashes, -nocommands, or -novariables}}
+} {1 {ambiguous switch "-no": must be -nobackslashes, -nocommands, or -novariables}}
 test subst-7.3 {switches} {
     list [catch {subst -bogus bar} msg] $msg
 } {1 {bad switch "-bogus": must be -nobackslashes, -nocommands, or -novariables}}
@@ -104,3 +107,19 @@ test subst-7.7 {switches} {
     set x 123
     subst -nov -nob -noc {abc $x [expr 1+2] \\\x41}
 } {abc $x [expr 1+2] \\\x41}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+