diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-20 08:24:16 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-20 08:24:16 (GMT) |
commit | bbe2ea1d0e29301b36d42a167abfe8f11d6a60b2 (patch) | |
tree | d3330833ffb9188ed9fb708d7585a4d882ddd358 /library | |
parent | 4bca76be3bbc5ddc9b2e49ed021b0f84fa09812b (diff) | |
parent | a15ea81906fdac4ed3868e9866d07a8ca4c2354c (diff) | |
download | tcl-bbe2ea1d0e29301b36d42a167abfe8f11d6a60b2.zip tcl-bbe2ea1d0e29301b36d42a167abfe8f11d6a60b2.tar.gz tcl-bbe2ea1d0e29301b36d42a167abfe8f11d6a60b2.tar.bz2 |
Merge 8.5.
Mark testcases io-50.* nonPortable: they fail too often in travis builds.
Diffstat (limited to 'library')
-rw-r--r-- | library/tcltest/tcltest.tcl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index e4edfda..c894ff1 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -811,14 +811,14 @@ namespace eval tcltest { trace add variable Option(-errfile) write \ [namespace code {errorChannel $Option(-errfile) ;#}] - proc loadIntoSlaveInterpreter {slave args} { + proc loadIntoChildInterpreter {child args} { variable Version - interp eval $slave [package ifneeded tcltest $Version] - interp eval $slave "tcltest::configure {*}{$args}" - interp alias $slave ::tcltest::ReportToMaster \ - {} ::tcltest::ReportedFromSlave + interp eval $child [package ifneeded tcltest $Version] + interp eval $child "tcltest::configure {*}{$args}" + interp alias $child ::tcltest::ReportToParent \ + {} ::tcltest::ReportedFromChild } - proc ReportedFromSlave {total passed skipped failed because newfiles} { + proc ReportedFromChild {total passed skipped failed because newfiles} { variable numTests variable skippedBecause variable createdNewFiles @@ -2462,8 +2462,8 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} { set testFileName [file tail [info script]] # Hook to handle reporting to a parent interpreter - if {[llength [info commands [namespace current]::ReportToMaster]]} { - ReportToMaster $numTests(Total) $numTests(Passed) $numTests(Skipped) \ + if {[llength [info commands [namespace current]::ReportToParent]]} { + ReportToParent $numTests(Total) $numTests(Passed) $numTests(Skipped) \ $numTests(Failed) [array get skippedBecause] \ [array get createdNewFiles] set testSingleFile false |