diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tests/compExpr-old.test | 4 | ||||
| -rw-r--r-- | tests/compExpr.test | 4 | ||||
| -rw-r--r-- | tests/expr-old.test | 4 | ||||
| -rw-r--r-- | tests/expr.test | 4 | ||||
| -rw-r--r-- | tests/indexObj.test | 4 | ||||
| -rw-r--r-- | tests/info.test | 4 | ||||
| -rw-r--r-- | tests/upvar.test | 10 |
8 files changed, 27 insertions, 16 deletions
@@ -1,5 +1,14 @@ 2006-04-06 Don Porter <dgp@users.sourceforge.net> + * tests/compExpr-old.test: Updated testmathfunctions constraint + * tests/compExpr.test: to post-TIP-232 world. + * tests/expr-old.test: + * tests/expr.test: + * tests/info.test: + + * tests/indexObj.test: Corrected other test errors revealed by + * tests/upvar.test: testing outside the tcltest application. + * generic/tclPathObj.c: Revised fix for the [Bug 1379287] family of path normalization bugs. diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test index cd406a1..c5bbb78 100644 --- a/tests/compExpr-old.test +++ b/tests/compExpr-old.test @@ -12,14 +12,14 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: compExpr-old.test,v 1.17 2006/03/21 11:12:29 dkf Exp $ +# RCS: @(#) $Id: compExpr-old.test,v 1.18 2006/04/06 18:19:24 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 namespace import -force ::tcltest::* } -if {[catch {expr T1()} msg] && $msg eq {unknown math function "T1"}} { +if {[catch {expr T1()} msg] && $msg eq {invalid command name "tcl::mathfunc::T1"}} { testConstraint testmathfunctions 0 } else { testConstraint testmathfunctions 1 diff --git a/tests/compExpr.test b/tests/compExpr.test index b9e8ba9..819ceca 100644 --- a/tests/compExpr.test +++ b/tests/compExpr.test @@ -8,14 +8,14 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: compExpr.test,v 1.10 2006/03/21 11:12:29 dkf Exp $ +# RCS: @(#) $Id: compExpr.test,v 1.11 2006/04/06 18:19:25 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import -force ::tcltest::* } -if {[catch {expr T1()} msg] && $msg eq {unknown math function "T1"}} { +if {[catch {expr T1()} msg] && $msg eq {invalid command name "tcl::mathfunc::T1"}} { testConstraint testmathfunctions 0 } else { testConstraint testmathfunctions 1 diff --git a/tests/expr-old.test b/tests/expr-old.test index 0b7711b..578e697 100644 --- a/tests/expr-old.test +++ b/tests/expr-old.test @@ -13,7 +13,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: expr-old.test,v 1.33 2006/03/21 18:30:54 dgp Exp $ +# RCS: @(#) $Id: expr-old.test,v 1.34 2006/04/06 18:19:25 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -25,7 +25,7 @@ testConstraint testexprdouble [llength [info commands testexprdouble]] testConstraint testexprstring [llength [info commands testexprstring]] testConstraint longIs32bit [expr {int(0x80000000) < 0}] -if {[catch {expr T1()} msg] && $msg eq {unknown math function "T1"}} { +if {[catch {expr T1()} msg] && $msg eq {invalid command name "tcl::mathfunc::T1"}} { testConstraint testmathfunctions 0 } else { testConstraint testmathfunctions 1 diff --git a/tests/expr.test b/tests/expr.test index 8f86e66..1f84e08 100644 --- a/tests/expr.test +++ b/tests/expr.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: expr.test,v 1.53 2006/03/25 16:58:38 dgp Exp $ +# RCS: @(#) $Id: expr.test,v 1.54 2006/04/06 18:19:25 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -18,7 +18,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { } testConstraint testmathfunctions [expr { - ([catch {expr T1()} msg] != 1) || ($msg ne {unknown math function "T1"}) + ([catch {expr T1()} msg] != 1) || ($msg ne {invalid command name "tcl::mathfunc::T1"}) }] # Determine if "long int" type is a 32 bit number and if the wide diff --git a/tests/indexObj.test b/tests/indexObj.test index 653275a..bb1c0a4 100644 --- a/tests/indexObj.test +++ b/tests/indexObj.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: indexObj.test,v 1.13 2006/04/05 15:17:39 dgp Exp $ +# RCS: @(#) $Id: indexObj.test,v 1.14 2006/04/06 18:19:25 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -60,7 +60,7 @@ test indexObj-2.4 {ambiguous value} testindexobj { test indexObj-2.5 {omit error message} testindexobj { list [catch {testindexobj 0 1 d x} msg] $msg } {1 {}} -test indexObj-2.6 {TCL_EXACT => no "ambiguous" error message} { +test indexObj-2.6 {TCL_EXACT => no "ambiguous" error message} testindexobj { list [catch {testindexobj 1 0 d dumb daughter a c} msg] $msg } {1 {bad token "d": must be dumb, daughter, a, or c}} test indexObj-2.7 {exact match of empty values} testindexobj { diff --git a/tests/info.test b/tests/info.test index 0dab4bd..a7a9913 100644 --- a/tests/info.test +++ b/tests/info.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: info.test,v 1.34 2005/10/10 21:50:01 dkf Exp $ +# RCS: @(#) $Id: info.test,v 1.35 2006/04/06 18:19:26 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -627,7 +627,7 @@ test info-19.6 {info vars: Bug 1072654} -setup { set functions {abs acos asin atan atan2 bool ceil cos cosh double entier exp floor fmod hypot int log log10 max min pow rand round sin sinh sqrt srand tan tanh wide} # Check whether the extra testing functions are defined... -if {!([catch {expr T1()} msg] && ($msg eq {unknown math function "T1"}))} { +if {!([catch {expr T1()} msg] && ($msg eq {invalid command name "tcl::mathfunc::T1"}))} { set functions "T1 T2 T3 $functions" ;# A lazy way of prepending! } test info-20.1 {info functions option} {info functions sin} sin diff --git a/tests/upvar.test b/tests/upvar.test index 0db9404..134e0c1 100644 --- a/tests/upvar.test +++ b/tests/upvar.test @@ -11,10 +11,10 @@ # 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.11 2006/02/01 17:48:13 dgp Exp $ +# RCS: @(#) $Id: upvar.test,v 1.12 2006/04/06 18:19:28 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -316,11 +316,13 @@ test upvar-8.7 {errors in upvar command} { proc p1 {} {trace variable a w foo; upvar b a} list [catch p1 msg] $msg } {1 {variable "a" has traces: can't use for upvar}} -test upvar-8.8 {create nested array with upvar} { +test upvar-8.8 {create nested array with upvar} -body { proc p1 {} {upvar x(a) b; set b(2) 44} catch {unset x} list [catch p1 msg] $msg -} {1 {can't set "b(2)": variable isn't array}} +} -cleanup { + unset x +} -result {1 {can't set "b(2)": variable isn't array}} test upvar-8.9 {upvar won't create namespace variable that refers to procedure variable} { catch {namespace delete {expand}[namespace children :: test_ns_*]} catch {rename MakeLink ""} |