summaryrefslogtreecommitdiffstats
path: root/tests/oo.test
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-07-25 22:11:18 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-07-25 22:11:18 (GMT)
commite6ab7a094e17c5ecfaed583a37feb06afbc6bd94 (patch)
tree39a2112341211435426b708bc1f762560a383c9a /tests/oo.test
parent492567dd1a47ceb460e19a20e233ff6d1efeb5ab (diff)
downloadtcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.zip
tcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.tar.gz
tcl-e6ab7a094e17c5ecfaed583a37feb06afbc6bd94.tar.bz2
* tests/info.test: Tests 38.* added, exactly testing the tracking
of location for uplevel scripts. Resolved merge conflict on info-37.0, switched !singleTestInterp constraint to glob matching instead. Ditto info-22.8, removed constraint, more glob matching, and reduced the depth of the stack we check. More is coming, right now I want to commit the bug fixes. * tests/oo.test: Updated oo-22.1 for expanded location tracking. * generic/tclCompile.c (TclInitCompileEnv): Reorganized the initialization of the #280 location information to match the flow in TclEvalObjEx to get more absolute contexts. * generic/tclBasic.c (TclEvalObjEx): Added missing cleanup of extended location information.
Diffstat (limited to 'tests/oo.test')
-rw-r--r--tests/oo.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/oo.test b/tests/oo.test
index f9b7be4..8ff06e8 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -7,7 +7,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: oo.test,v 1.8 2008/07/19 22:50:39 nijtmans Exp $
+# RCS: @(#) $Id: oo.test,v 1.9 2008/07/25 22:11:21 andreas_kupries Exp $
package require TclOO 0.4 ;# Must match value in configure.in
if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -1685,7 +1685,7 @@ test oo-21.4 {OO: inheritance ordering} -setup {
test oo-22.1 {OO and info frame} -setup {
oo::class create c
c create i
-} -body {
+} -match glob -body {
oo::define c self method frame {} {
info frame 0
}
@@ -1708,7 +1708,7 @@ test oo-22.1 {OO and info frame} -setup {
list [i level] [i frames] [dict get [c frame] object]
} -cleanup {
c destroy
-} -result {1 {{type proc line 2 cmd {info frame 0} method frames class ::c level 0} {type proc line 2 cmd {info frame 0} method frames object ::i level 0}} ::c}
+} -result {1 {{type source line * file * cmd {info frame 0} method frames class ::c level 0} {type source line * file * cmd {info frame 0} method frames object ::i level 0}} ::c}
# Prove that the issue in [Bug 1865054] isn't an issue any more
test oo-23.1 {Self-like derivation; complex case!} -setup {