diff options
author | dgp <dgp@noemail.net> | 2002-06-26 03:25:05 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2002-06-26 03:25:05 (GMT) |
commit | ea7e27697813174a3607a15bda769618de32940c (patch) | |
tree | 56704b807dc239981a2a9ffdeb244cbf4959f4a9 /library | |
parent | 74a5c3a0ca047363bbf7016466966cae843e02ba (diff) | |
download | tcl-ea7e27697813174a3607a15bda769618de32940c.zip tcl-ea7e27697813174a3607a15bda769618de32940c.tar.gz tcl-ea7e27697813174a3607a15bda769618de32940c.tar.bz2 |
* Corrected suppression of -verbose skip and start by [test -output].
Also corrected test suite errors exposed by corrected code.
[Bug 564656]
FossilOrigin-Name: cb6328465c206d964b8e082060311d806078b435
Diffstat (limited to 'library')
-rw-r--r-- | library/tcltest/tcltest.tcl | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 9b93ddb..18ebf71 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -16,7 +16,7 @@ # Contributions from Don Porter, NIST, 2002. (not subject to US copyright) # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.57 2002/06/26 01:11:09 dgp Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.58 2002/06/26 03:25:06 dgp Exp $ package require Tcl 8.3 ;# uses [glob -directory] namespace eval tcltest { @@ -1477,12 +1477,12 @@ proc tcltest::Replace::puts {args} { if {[string equal $channel [[namespace parent]::outputChannel]] || [string equal $channel stdout]} { append outData [lindex $args end]\n + return } elseif {[string equal $channel [[namespace parent]::errorChannel]] || [string equal $channel stderr]} { append errData [lindex $args end]\n + return } - return - # return [Puts [lindex $args 0] [lindex $args end]] } # If we haven't returned by now, we don't know how to handle the @@ -2175,7 +2175,13 @@ proc tcltest::RunTest { if {$doTest == 0} { if {[IsVerbose skip]} { - puts [outputChannel] "++++ $name SKIPPED: $constraints" + if {[string equal [namespace current]::Replace::puts \ + [namespace origin puts]]} { + Replace::Puts [outputChannel] \ + "++++ $name SKIPPED: $constraints" + } else { + puts [outputChannel] "++++ $name SKIPPED: $constraints" + } } if {$testLevel == 1} { @@ -2208,7 +2214,12 @@ proc tcltest::RunTest { } if {[IsVerbose start]} { - puts [outputChannel] "---- $name start" + if {[string equal [namespace current]::Replace::puts \ + [namespace origin puts]]} { + Replace::Puts [outputChannel] "---- $name start" + } else { + puts [outputChannel] "---- $name start" + } flush [outputChannel] } |