summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-10-08 14:37:36 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-10-08 14:37:36 (GMT)
commit96e6cf13bf6f34d470255420538843d45d04aed9 (patch)
tree0e19ed6fc085b82d76297784349b278f616bb5d3 /tests
parent4b5432b3e850af2f49c5d0d58d48a3736dcf0012 (diff)
downloadtcl-96e6cf13bf6f34d470255420538843d45d04aed9.zip
tcl-96e6cf13bf6f34d470255420538843d45d04aed9.tar.gz
tcl-96e6cf13bf6f34d470255420538843d45d04aed9.tar.bz2
[Bug 2874678]: Don't leak bignums in [dict incr]...
Diffstat (limited to 'tests')
-rw-r--r--tests/dict.test37
1 files changed, 22 insertions, 15 deletions
diff --git a/tests/dict.test b/tests/dict.test
index b83a5ed..b4f0f0e 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: dict.test,v 1.32 2008/12/15 23:09:24 dkf Exp $
+# RCS: @(#) $Id: dict.test,v 1.33 2009/10/08 14:37:36 dkf Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -18,6 +18,17 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
# Used for constraining memory leak tests
testConstraint memory [llength [info commands memory]]
+if {[testConstraint memory]} {
+ proc memtest script {
+ set end [lindex [split [memory info] \n] 3 3]
+ for {set i 0} {$i < 5} {incr i} {
+ uplevel 1 $script
+ set tmp $end
+ set end [lindex [split [memory info] \n] 3 3]
+ }
+ expr {$end - $tmp}
+ }
+}
# Procedure to help check the contents of a dictionary. Note that we
# can't just compare the string version because the order of the
@@ -818,15 +829,9 @@ test dict-19.1 {memory bug} {
dict get $successors x
}}
} [dict create c d a b]
-test dict-19.2 {dict: testing for leaks} -setup {
- proc getbytes {} {
- set lines [split [memory info] "\n"]
- lindex [lindex $lines 3] 3
- }
-} -constraints memory -body {
+test dict-19.2 {dict: testing for leaks} -constraints memory -body {
# This test is made to stress object reference management
- set end [getbytes]
- for {set i 0} {$i < 5} {incr i} {
+ memtest {
apply {{} {
# A shared invalid dictinary
set apa {a {}b c d}
@@ -929,14 +934,16 @@ test dict-19.2 {dict: testing for leaks} -setup {
trace remove variable bepa write {error hej}
unset bepa
}}
- set tmp $end
- set end [getbytes]
}
- expr {$end - $tmp}
+} -result 0
+test dict-19.3 {testing for leaks - Bug 2874678} -constraints memory -body {
+ set d aDictVar; # Force interpreted [dict incr]
+ memtest {
+ dict incr $d aKey 0
+ unset $d
+ }
} -cleanup {
- unset -nocomplain end i tmp
- rename getbytes {}
-# rename stress {}
+ unset d
} -result 0
test dict-20.1 {dict merge command} {