* 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.

1 files changed, 6 insertions, 4 deletions

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 ""}