diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-02 11:50:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-02 11:50:26 (GMT) |
| commit | b6a51d3251900f9a7edfb65d456fdbed3d1a9eb2 (patch) | |
| tree | 1aa4a661a5a5f648d5930867272ce9fb38e6ebca /library | |
| parent | 332c5aadfa15b6d8ad2886ac24efa0347fcbffc6 (diff) | |
| parent | 8e1f9bb6d10b8e3a492a329e0476238c4893e96f (diff) | |
| download | tcl-b6a51d3251900f9a7edfb65d456fdbed3d1a9eb2.zip tcl-b6a51d3251900f9a7edfb65d456fdbed3d1a9eb2.tar.gz tcl-b6a51d3251900f9a7edfb65d456fdbed3d1a9eb2.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library')
| -rw-r--r-- | library/tcltest/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index ca93725..4aa3970 100644 --- a/library/tcltest/pkgIndex.tcl +++ b/library/tcltest/pkgIndex.tcl @@ -9,4 +9,4 @@ # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.5-]} {return} -package ifneeded tcltest 2.5.1 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.5.2 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 820e978..4171965 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -22,7 +22,7 @@ namespace eval tcltest { # When the version number changes, be sure to update the pkgIndex.tcl file, # and the install directory in the Makefiles. When the minor version # changes (new feature) be sure to update the man page as well. - variable Version 2.5.1 + variable Version 2.5.2 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -2358,12 +2358,21 @@ proc tcltest::RunTest {name script} { memory tag $name } - set code [catch {uplevel 1 $script} actualAnswer] + set code [catch {uplevel 1 [list [ + namespace origin EvalTest] $script]} actualAnswer copts] return [list $actualAnswer $code] } +proc tcltest::EvalTest script { + set code [catch {uplevel 1 $script} cres copts] + dict set copts -code $code + dict incr copts -level + return -options $copts $cres +} + + # SetupTest -- # |