summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--tests/info.test4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 128df86..50c1725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
to prevent seg.faulting. Forward port from valgrinding the Tcl 8.5
branch.
+ * tests/info.test: Resolve ambiguous resolution of variable
+ "res". Forward port from 8.5
+
2009-11-08 Donal K. Fellows <dkf@users.sf.net>
* doc/string.n (bytelength): Noted that this command is not a good
diff --git a/tests/info.test b/tests/info.test
index 7e89d8e..da54562 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.69 2009/10/29 22:20:12 dkf Exp $
+# RCS: @(#) $Id: info.test,v 1.70 2009/11/09 22:59:13 andreas_kupries Exp $
if {{::tcltest} ni [namespace children]} {
package require tcltest 2
@@ -1033,7 +1033,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} -body {
+test info-31.0 {ns eval, script in variable} -body {set res {}
namespace eval foo $body
return $foo::res
} -result {type eval line 3 cmd {info frame 0} level 0} -cleanup {