Squelch the false [Bug 1342858] by removing traces cleanly. The trace leaking

is being pursued elsewhere.

2 files changed, 44 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 5907b3d..eccea37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
+2005-11-07  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
+
+	* tests/dict.test (dict-19.2): arrange for the stress testing code to
+	only stress test the dict code and not the trace code as well. [Bug
+	1342858]
+
 2005-11-05  Miguel Sofer <msofer@users.sf.net>
 
-	* tests/trace.test (trace-8.9): added test to detect leak, see
-	[Bug 1348775].
+	* tests/trace.test (trace-8.9): added test to detect leak, see [Bug
+	1348775].
 
 2005-11-04  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* win/tclWinPort.h:  Applied patch #1267871 by Matt Newman for
+	* win/tclWinPort.h:  Applied [Patch 1267871] by Matt Newman for
 	* win/tclWinPipe.c:  extended error code support on Windows.
 	* tests/exec.test:   Tests for extended error codes.
 	* generic/tclPipe.c: Permit long codes (platform macros permitting).
@@ -21,52 +27,51 @@
 	* generic/tclIOCmd.c:
 	* generic/tclLink.c:
 	* generic/tclTest.c:
-	* generic/tclVar.c: fix for [Bug 1334947]. The functions
-	TclPtrSetVar, Tcl_ObjSetVar2 and Tcl_SetVar2Ex now always consume
-	the newValuePtr argument - i.e., they will free a 0-refCount
-	object if they failed to set the variable. Fixed all callers in
-	the core. 
+	* generic/tclVar.c: fix for [Bug 1334947]. The functions TclPtrSetVar,
+	Tcl_ObjSetVar2 and Tcl_SetVar2Ex now always consume the newValuePtr
+	argument - i.e., they will free a 0-refCount object if they failed to
+	set the variable. Fixed all callers in the core.
 
 2005-11-04  Kevin Kenny  <kennykb@acm.org>
 
 	* generic/tclGetDate.y: Added abbreviations for the Korean
 	* library/clock.tcl:    timezone. [Patch 1298737]
 	* generic/tclDate.c:    Regenerated.
-	
+
 	* tools/findBadExternals.tcl: Added this script, which locates
-	external symbols that do not begin with 'Tcl' or 'tcl' and hence
-	might be in conflict with other link libraries.  Thanks to George
-	Peter Staplin for the idea and the initial version of the script.
-	[Bug 1263012]
-	
+	external symbols that do not begin with 'Tcl' or 'tcl' and hence might
+	be in conflict with other link libraries. Thanks to George Peter
+	Staplin for the idea and the initial version of the script. [Bug
+	1263012]
+
 	* unix/Makefile.in: Trimmed a bunch of fat out of the tommath/
 	directory in 'make dist'. [RFE 1333318]
 
 	* unix/tcl.m4: Added code to enable [load] on LynxOS. Thanks to
-	heidibr@users.sf.net for the patch. [Bug 1163896].  Removed the
-	last vestiges of GNU dld from the Unix build [RFE 1071992].
-	
+	heidibr@users.sf.net for the patch. [Bug 1163896]. Removed the last
+	vestiges of GNU dld from the Unix build [RFE 1071992].
+
 	* unix/tclLoadDld.c: Removed.
 	* unix/configure: Regenerated.
-	
+
 2005-11-04  Miguel Sofer <msofer@users.sf.net>
 
 	* generic/tclInt.h:
-	* generic/tclNamesp.c: 
-	* generic/tclVar.c: 
-	* tests/trace.test: fix for [Bugs 1338280/1337229]; changed to use
-	the same approach as the 8.4 patch in the ticket (i.e., removed
-	the patch committed on 2005-31-10).
-	
+	* generic/tclNamesp.c:
+	* generic/tclVar.c:
+	* tests/trace.test: fix for [Bugs 1338280/1337229]; changed to use the
+	same approach as the 8.4 patch in the ticket (i.e., removed the patch
+	committed on 2005-31-10).
+
 2005-11-03  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* win/tclWin32Dll.c:   Applied patch #1256872 to provide unicode
+	* win/tclWin32Dll.c:   Applied [Patch 1256872] to provide unicode
 	* win/tclWinConsole.c: support in the console on suitable systems.
 	* win/tclWinInt.h:     Patch by Anton Kovalenko
 
 2005-11-02  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	Applied patch #1096916 to support building with MSVC 8.
+	Applied [Patch 1096916] to support building with MSVC 8.
 	* generic/regerror.c: Avoid use of reserved word.
 	* generic/tcl.h:      Select the right Tcl_Stat structure
 	* generic/tclDate.c:  Casts to handle 64 bit time_t case.
@@ -87,8 +92,8 @@
 	* tests/unixNotfy.test (1.1,2):	Update error message whitespace to
 	match changes in code.
 
-	* tests/expr-old.test (expr-32.52):     Use int(.) to restrict
-        result of left shift to the C long range.
+	* tests/expr-old.test (expr-32.52):     Use int(.) to restrict result
+	of left shift to the C long range.
 
 	* expr.test (expr-46.13):	Added test that illustrates
 	shortcoming of Patch 1340260.
diff --git a/tests/dict.test b/tests/dict.test
index 1733424..19f7088 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.14 2005/10/08 14:42:54 dgp Exp $
+# RCS: @(#) $Id: dict.test,v 1.15 2005/11/07 09:38:22 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -808,6 +808,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa [lrange $apa 0 end]
         trace add variable bepa write {error hej}
         catch {dict incr bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to a shared object, incr
@@ -815,6 +816,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa $apa
         trace add variable bepa write {error hej}
         catch {dict incr bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # A shared valid dictionary, invalid lappend
@@ -827,6 +829,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa [lrange $apa 0 end]
         trace add variable bepa write {error hej}
         catch {dict lappend bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to a shared object, lappend
@@ -834,6 +837,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa $apa
         trace add variable bepa write {error hej}
         catch {dict lappend bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to an unshared object, append
@@ -841,6 +845,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa [lrange $apa 0 end]
         trace add variable bepa write {error hej}
         catch {dict append bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to a shared object, append
@@ -848,6 +853,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa $apa
         trace add variable bepa write {error hej}
         catch {dict append bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to an unshared object, set
@@ -855,6 +861,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa [lrange $apa 0 end]
         trace add variable bepa write {error hej}
         catch {dict set bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to a shared object, set
@@ -862,6 +869,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa $apa
         trace add variable bepa write {error hej}
         catch {dict set bepa a 5}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to an unshared object, unset
@@ -869,6 +877,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa [lrange $apa 0 end]
         trace add variable bepa write {error hej}
         catch {dict unset bepa a}
+	trace remove variable bepa write {error hej}
         unset bepa
 
         # An error during write to a shared object, unset
@@ -876,6 +885,7 @@ test dict-19.2 {dict: testing for leaks} -setup {
         set bepa $apa
         trace add variable bepa write {error hej}
         catch {dict unset bepa a}
+	trace remove variable bepa write {error hej}
         unset bepa
     }
 } -constraints memory -body {