summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-05-17 21:42:32 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-05-17 21:42:32 (GMT)
commit549bca53eb8459be31dd2ffb973f179b5f785562 (patch)
treecb5ccb5cd76d46dde4f46c25d427c60f7ed5c590
parent92201d56274ec5ce7328aef2e606f27d47274409 (diff)
downloadtcl-549bca53eb8459be31dd2ffb973f179b5f785562.zip
tcl-549bca53eb8459be31dd2ffb973f179b5f785562.tar.gz
tcl-549bca53eb8459be31dd2ffb973f179b5f785562.tar.bz2
Changed test back to what it used to be in 7.* now that [set] counts as a
real command once again. :^)
-rw-r--r--ChangeLog4
-rw-r--r--tests/info.test8
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e087710..90ee27f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-05-17 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+ * tests/info.test (info-3.1): Corrected test result back to what
+ it used to be in Tcl 7.* now that command counts are being
+ correctly kept.
+
* generic/tclExecute.c (TEBC:INST_START_CMD): Make sure that the
command-count is always advanced. Allows TIP#143 limits to tell
that work is being done.
diff --git a/tests/info.test b/tests/info.test
index 30ce636..ec77d0b 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -11,7 +11,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.25 2003/03/27 13:19:15 dkf Exp $
+# RCS: @(#) $Id: info.test,v 1.26 2004/05/17 21:42:34 dkf Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -103,10 +103,6 @@ test info-2.6 {info body option, returning list bodies} {
[foo; string bytelength [info body foo]]
} {9 9}
-# "info cmdcount" is no longer accurate for compiled commands!
-# The expected result for info-3.1 used to be "3" and is now "1"
-# since the "set"s have been compiled away. info-3.2 was corrected
-# in 8.3 because the eval'ed body won't be compiled.
proc testinfocmdcount {} {
set x [info cmdcount]
set y 12345
@@ -115,7 +111,7 @@ proc testinfocmdcount {} {
}
test info-3.1 {info cmdcount compiled} {
testinfocmdcount
-} 1
+} 3
test info-3.2 {info cmdcount evaled} {
set x [info cmdcount]
set y 12345