diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-06-27 17:29:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-06-27 17:29:20 (GMT) |
| commit | 508902e0fee4e8981302823b171f4fb6ddb7f50d (patch) | |
| tree | dc54a77e597ad6a8cdc37faa23c9ba1a796d2660 /generic/tclTest.c | |
| parent | a384f578db158e03a8216ded58a85f751f9bc2a4 (diff) | |
| download | tcl-508902e0fee4e8981302823b171f4fb6ddb7f50d.zip tcl-508902e0fee4e8981302823b171f4fb6ddb7f50d.tar.gz tcl-508902e0fee4e8981302823b171f4fb6ddb7f50d.tar.bz2 | |
* generic/tclCmdMZ.c: Corrected broken trace reversal logic in
* generic/tclTest.c: TclCheckInterpTraces that led to infinite loop
* tests/basic.test: when multiple Tcl_CreateTrace traces were set and
one of them did not fire due to level restrictions. [Bug 1743931].
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 73ef0ab..433444b 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTest.c,v 1.62.2.13 2006/09/22 01:26:23 andreas_kupries Exp $ + * RCS: @(#) $Id: tclTest.c,v 1.62.2.14 2007/06/27 17:29:23 dgp Exp $ */ #define TCL_TEST @@ -1165,10 +1165,25 @@ TestcmdtraceCmd(dummy, interp, argc, argv) } else { return result; } - + } else if ( strcmp(argv[1], "doubletest" ) == 0 ) { + Tcl_Trace t1, t2; + + Tcl_DStringInit(&buffer); + t1 = Tcl_CreateTrace(interp, 1, + (Tcl_CmdTraceProc *) CmdTraceProc, (ClientData) &buffer); + t2 = Tcl_CreateTrace(interp, 50000, + (Tcl_CmdTraceProc *) CmdTraceProc, (ClientData) &buffer); + result = Tcl_Eval(interp, argv[2]); + if (result == TCL_OK) { + Tcl_ResetResult(interp); + Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), NULL); + } + Tcl_DeleteTrace(interp, t2); + Tcl_DeleteTrace(interp, t1); + Tcl_DStringFree(&buffer); } else { Tcl_AppendResult(interp, "bad option \"", argv[1], - "\": must be tracetest, deletetest or resulttest", + "\": must be tracetest, deletetest, doubletest or resulttest", (char *) NULL); return TCL_ERROR; } |