summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-11-09 22:58:59 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-11-09 22:58:59 (GMT)
commita21451adb18ccaea3e9e1b573d8640f21b9ee4c2 (patch)
tree0295335b7355ae81d115fb9de57c6124be82ce9b
parentbc34ab780eb1ae322a8bad7b0cc71e9bf2774f06 (diff)
downloadtcl-a21451adb18ccaea3e9e1b573d8640f21b9ee4c2.zip
tcl-a21451adb18ccaea3e9e1b573d8640f21b9ee4c2.tar.gz
tcl-a21451adb18ccaea3e9e1b573d8640f21b9ee4c2.tar.bz2
* tests/info.test: Resolve ambiguous resolution of variable
"res". Backport from 8.5
-rw-r--r--ChangeLog3
-rw-r--r--tests/info.test4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5aa007f..08426a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
to prevent seg.faulting. Backport from valgrinding the Tcl 8.5
branch.
+ * tests/info.test: Resolve ambiguous resolution of variable
+ "res". Backport from 8.5
+
2009-10-23 Andreas Kupries <andreask@activestate.com>
* generic/tclCompCmds.c: [Bug 2881263] (TclCompileForeachCmd,
diff --git a/tests/info.test b/tests/info.test
index 21e4f75..c225127 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.24.2.13 2009/08/25 20:59:11 andreas_kupries Exp $
+# RCS: @(#) $Id: info.test,v 1.24.2.14 2009/11/09 22:58:59 andreas_kupries Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -969,7 +969,7 @@ set body {set flag 0
set a c
set res [info frame 0]} ;# line 3!
-test info-31.0 {ns eval, script in variable} tip280 {
+test info-31.0 {ns eval, script in variable} tip280 {set res {}
namespace eval foo $body
set res
} {type eval line 3 cmd {info frame 0} level 0}