diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2011-03-10 16:25:31 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2011-03-10 16:25:31 (GMT) |
| commit | 595b0578b02537167e39fb7f4d2c25a18b196391 (patch) | |
| tree | 77df4dfa75e6827594aea301cde3f1f48c8fb4c4 | |
| parent | 226803c44fa0615537f00d627caf13edc292ae67 (diff) | |
| download | tcl-595b0578b02537167e39fb7f4d2c25a18b196391.zip tcl-595b0578b02537167e39fb7f4d2c25a18b196391.tar.gz tcl-595b0578b02537167e39fb7f4d2c25a18b196391.tar.bz2 | |
Fix remaining broken tests (test failures appear non-serious)
| -rw-r--r-- | generic/tclTest.c | 8 | ||||
| -rw-r--r-- | tests/nre.test | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index fc29702..47d271e 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6724,7 +6724,7 @@ TestNRELevels( ptrdiff_t depth; Tcl_Obj *levels[6]; int i = 0; - NRE_callback *cbPtr = ((Interp *) interp)->execEnvPtr->callbackPtr; + NRE_callback *cbPtr = iPtr->execEnvPtr->callbackPtr; if (refDepth == NULL) { refDepth = &depth; @@ -6733,11 +6733,11 @@ TestNRELevels( depth = (refDepth - &depth); levels[0] = Tcl_NewIntObj(depth); - levels[1] = Tcl_NewIntObj(((Interp *)interp)->numLevels); + levels[1] = Tcl_NewIntObj(iPtr->numLevels); levels[2] = Tcl_NewIntObj(iPtr->cmdFramePtr->level); levels[3] = Tcl_NewIntObj(iPtr->varFramePtr->level); - levels[4] = Tcl_NewIntObj((iPtr->execEnvPtr->execStackPtr->tosPtr - - iPtr->execEnvPtr->execStackPtr->stackWords)); + levels[4] = Tcl_NewIntObj(iPtr->execEnvPtr->execStackPtr->tosPtr + - iPtr->execEnvPtr->execStackPtr->stackWords); while (cbPtr) { i++; diff --git a/tests/nre.test b/tests/nre.test index 2c97edc..295f02e 100644 --- a/tests/nre.test +++ b/tests/nre.test @@ -161,7 +161,7 @@ test nre-5.1 {[namespace eval] is not recursive} -setup { namespace delete ::foo } -constraints { testnrelevels -} -result {{0 2 2 2} 0} +} -result {{0 3 2 2} 0} test nre-5.2 {[namespace eval] is not recursive} -setup { namespace eval ::foo { @@ -174,7 +174,7 @@ test nre-5.2 {[namespace eval] is not recursive} -setup { namespace delete ::foo } -constraints { testnrelevels -} -result {{0 2 2 2} 0} +} -result {{0 3 2 2} 0} test nre-6.1 {[uplevel] is not recursive} -setup { proc a i [makebody {uplevel 1 [list a $i]}] |