diff options
author | dgp <dgp@users.sourceforge.net> | 2020-07-23 19:17:44 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2020-07-23 19:17:44 (GMT) |
commit | 9185af5e7ad122946296cc033f8a7ade484d6289 (patch) | |
tree | e5ff8d1cae1657ed967393ad0bb168eb0a304c44 /library | |
parent | e2610bc7c7abc78d926609c5867c7e4f88ec4940 (diff) | |
parent | f472165a3dc7d353f90af7f8143d2780b11c93fe (diff) | |
download | tcl-9185af5e7ad122946296cc033f8a7ade484d6289.zip tcl-9185af5e7ad122946296cc033f8a7ade484d6289.tar.gz tcl-9185af5e7ad122946296cc033f8a7ade484d6289.tar.bz2 |
merge 8.6
Diffstat (limited to 'library')
-rw-r--r-- | library/tcltest/tcltest.tcl | 16 | ||||
-rw-r--r-- | library/tm.tcl | 6 |
2 files changed, 13 insertions, 9 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 diff --git a/library/tm.tcl b/library/tm.tcl index 1802bb9..0ed3f1a 100644 --- a/library/tm.tcl +++ b/library/tm.tcl @@ -238,12 +238,16 @@ proc ::tcl::tm::UnknownHandler {original name args} { continue } - if {[package ifneeded $pkgname $pkgversion] ne {}} { + if {([package ifneeded $pkgname $pkgversion] ne {}) + && (![interp issafe]) + } { # There's already a provide script registered for # this version of this package. Since all units of # code claiming to be the same version of the same # package ought to be identical, just stick with # the one we already have. + # This does not apply to Safe Base interpreters because + # the token-to-directory mapping may have changed. continue } |