diff options
| author | pooryorick <com.digitalsmarties@pooryorick.com> | 2019-12-01 13:52:06 (GMT) |
|---|---|---|
| committer | pooryorick <com.digitalsmarties@pooryorick.com> | 2019-12-01 13:52:06 (GMT) |
| commit | 7363d850a9f55fcadb58e4f6791cb0475dd5bdcf (patch) | |
| tree | 809e3caf5735db68969ffe94d1a98a61eaed42cd | |
| parent | af1ecf410ef2f7ec370c16a9a1c24951a61d1f42 (diff) | |
| parent | d138d28133e65fbabfecdf4ed817196b81debc81 (diff) | |
| download | tcl-7363d850a9f55fcadb58e4f6791cb0475dd5bdcf.zip tcl-7363d850a9f55fcadb58e4f6791cb0475dd5bdcf.tar.gz tcl-7363d850a9f55fcadb58e4f6791cb0475dd5bdcf.tar.bz2 | |
merge 8.6
| -rw-r--r-- | library/tcltest/tcltest.tcl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 2d36d13..820e978 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -1983,8 +1983,9 @@ proc tcltest::test {name description args} { } # First, run the setup script - lassign [uplevel 1 [list [ - namespace which SetupScript] $setup]] code setupMsg + set code [catch { + uplevel 1 [list [namespace which SetupTest] $setup] + } setupMsg] if {$code == 1} { set errorInfo(setup) $::errorInfo set errorCodeRes(setup) $::errorCode @@ -2368,11 +2369,8 @@ proc tcltest::RunTest {name script} { # # Evaluates the -setup script for a test -proc tcltest::SetupTest {name script} { - DebugPuts 3 [list Setup Script for $name $script] - - set code [catch {uplevel 1 $setup} setupMsg] - return [list $code $setupMsg] +proc tcltest::SetupTest setup { + uplevel 1 $setup } ##################################################################### |