diff options
| -rw-r--r-- | tests/appendComp.test | 5 | ||||
| -rw-r--r-- | tests/string.test | 8 | ||||
| -rw-r--r-- | tests/unsupported.test | 4 | ||||
| -rw-r--r-- | tests/upvar.test | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/tests/appendComp.test b/tests/appendComp.test index e912186..90b2af5 100644 --- a/tests/appendComp.test +++ b/tests/appendComp.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution of # this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: appendComp.test,v 1.11 2008/09/08 10:49:04 dkf Exp $ +# RCS: @(#) $Id: appendComp.test,v 1.12 2008/10/14 18:49:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -270,7 +270,8 @@ test appendComp-7.2 {lappend var triggers read trace, index var} -setup { bar } -result {myvar {} r} test appendComp-7.3 {lappend var triggers read trace, stack var} -setup { - catch {unset ::result} + unset -nocomplain ::result + unset -nocomplain ::myvar } -body { proc bar {} { trace variable ::myvar r foo diff --git a/tests/string.test b/tests/string.test index 27537d4..536189f 100644 --- a/tests/string.test +++ b/tests/string.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: string.test,v 1.75 2008/10/03 00:01:35 dkf Exp $ +# RCS: @(#) $Id: string.test,v 1.76 2008/10/14 18:49:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1679,10 +1679,10 @@ test string-26.2 {tcl::prefix, bad args} -body { test string-26.3 {tcl::prefix, bad args} -body { tcl::prefix match -error "{}x" -exact str1 str2 } -returnCodes 1 -result {list element in braces followed by "x" instead of space} -test string-26.3 {tcl::prefix, bad args} -body { +test string-26.3.1 {tcl::prefix, bad args} -body { tcl::prefix match -error "x" -exact str1 str2 } -returnCodes 1 -result {error options must have an even number of elements} -test string-26.3 {tcl::prefix, bad args} -body { +test string-26.3.2 {tcl::prefix, bad args} -body { tcl::prefix match -error str1 str2 } -returnCodes 1 -result {missing error options} test string-26.4 {tcl::prefix, bad args} -body { @@ -1706,7 +1706,7 @@ test string-26.9 {tcl::prefix} -body { test string-26.10 {tcl::prefix} -body { tcl::prefix match -error {-level 1} {apa bepa bear depa} be } -returnCodes 2 -result {ambiguous option "be": must be apa, bepa, bear, or depa} -test string-26.10 {tcl::prefix} -setup { +test string-26.10.1 {tcl::prefix} -setup { proc _testprefix {args} { array set opts {-a x -b y -c y} foreach {opt val} $args { diff --git a/tests/unsupported.test b/tests/unsupported.test index d4b11de..0c706b8 100644 --- a/tests/unsupported.test +++ b/tests/unsupported.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unsupported.test,v 1.14 2008/10/14 16:35:44 dgp Exp $ +# RCS: @(#) $Id: unsupported.test,v 1.15 2008/10/14 18:49:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -789,7 +789,7 @@ test unsupported-C.4.2 {bug #2093188} -setup { unset ::res } -result {{} 3 {{v {} read} {v {} unset}}} -test unsupported-C.4.2 {bug #2093947} -setup { +test unsupported-C.4.3 {bug #2093947} -setup { proc foo {} { set v 1 trace add variable v {write unset} bar diff --git a/tests/upvar.test b/tests/upvar.test index d774626..9e1b2d9 100644 --- a/tests/upvar.test +++ b/tests/upvar.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: upvar.test,v 1.17 2008/09/26 19:36:51 dgp Exp $ +# RCS: @(#) $Id: upvar.test,v 1.18 2008/10/14 18:49:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -548,7 +548,7 @@ test upvar-NS-2.1 {TIP 323} -returnCodes error -body { namespace upvar } -result {wrong # args: should be "namespace upvar ns ?otherVar myVar ...?"} -test upvar-NS-2.1 {TIP 323} -setup { +test upvar-NS-2.2 {TIP 323} -setup { namespace eval test_ns_1 {} } -body { namespace upvar test_ns_1 |