diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-06-16 20:44:30 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-06-16 20:44:30 (GMT) |
| commit | 9cdb9226b26637935610c316d18dc5d75ead7f85 (patch) | |
| tree | 9d6de1eb31f6101cb24b542829483e5fa2e46fab /tests | |
| parent | bb2f5b269ff49ce4ad2e6bf18bf4f71218031e46 (diff) | |
| download | tcl-9cdb9226b26637935610c316d18dc5d75ead7f85.zip tcl-9cdb9226b26637935610c316d18dc5d75ead7f85.tar.gz tcl-9cdb9226b26637935610c316d18dc5d75ead7f85.tar.bz2 | |
* generic/tclCmdIL.c (TclInfoFrame): Backport of fix made on the
* tests/info.test: head branch :: Moved the code looking up the
information for key 'proc' out of the TCL_LOCATION_BC branch to
after the switch, this is common to all frame types. Updated the
testsuite to match. This was exposed by the 2008-06-08 commit
(Miguel), switching uplevel from direct eval to compilation. Fixes
[Bug 1987851].
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/info.test | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/info.test b/tests/info.test index a6fa48d..63b8a79 100644 --- a/tests/info.test +++ b/tests/info.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: info.test,v 1.47 2007/12/13 15:26:06 dgp Exp $ +# RCS: @(#) $Id: info.test,v 1.47.2.1 2008/06/16 20:44:32 andreas_kupries Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -748,13 +748,13 @@ test info-22.2 {info frame, bad level absolute} {!singleTestInterp} { } {bad level "9"} test info-22.3 {info frame, current, relative} { info frame 0 -} {type eval line 2 cmd {info frame 0}} +} {type eval line 2 cmd {info frame 0} proc ::tcltest::RunTest} test info-22.4 {info frame, current, relative, nested} { set res [info frame 0] -} {type eval line 2 cmd {info frame 0}} +} {type eval line 2 cmd {info frame 0} proc ::tcltest::RunTest} test info-22.5 {info frame, current, absolute} {!singleTestInterp} { reduce [info frame 7] -} {type eval line 2 cmd {info frame 7}} +} {type eval line 2 cmd {info frame 7} proc ::tcltest::RunTest} test info-22.6 {info frame, global, relative} {!singleTestInterp} { reduce [info frame -6] } {type source line 758 file info.test cmd test\ info-22.6\ \{info\ frame,\ global,\ relative\}\ \{!singleTestInter level 0} @@ -787,14 +787,14 @@ test info-23.3 {eval'd info frame, literal} { eval { info frame 0 } -} {type eval line 2 cmd {info frame 0}} +} {type eval line 2 cmd {info frame 0} proc ::tcltest::RunTest} test info-23.4 {eval'd info frame, semi-dynamic} { eval info frame 0 -} {type eval line 1 cmd {info frame 0}} +} {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest} test info-23.5 {eval'd info frame, dynamic} { set script {info frame 0} eval $script -} {type eval line 1 cmd {info frame 0}} +} {type eval line 1 cmd {info frame 0} proc ::tcltest::RunTest} test info-23.6 {eval'd info frame, trace} {knownBug !singleTestInterp} { set script {etrace} join [eval $script] \n @@ -982,7 +982,7 @@ test info-31.5 {for, script in variable} { test info-31.6 {eval, script in variable} { eval $body set res -} {type eval line 3 cmd {info frame 0}} +} {type eval line 3 cmd {info frame 0} proc ::tcltest::RunTest} # ------------------------------------------------------------------------- |