diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-06-23 08:42:36 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-06-23 08:42:36 (GMT) |
commit | 33356d7984d054b9c6888c451f8d331e35ed292b (patch) | |
tree | af284d1eef224c641b9d0b8676614bbfc32fac2b /library/tcltest/tcltest.tcl | |
parent | aba59c2bf7de72267f36362e81a8be60872a5b9f (diff) | |
parent | 800d3e4d102540eeeaa223f428f007ea81f1015c (diff) | |
download | tcl-33356d7984d054b9c6888c451f8d331e35ed292b.zip tcl-33356d7984d054b9c6888c451f8d331e35ed292b.tar.gz tcl-33356d7984d054b9c6888c451f8d331e35ed292b.tar.bz2 |
merge trunk
Diffstat (limited to 'library/tcltest/tcltest.tcl')
-rw-r--r-- | library/tcltest/tcltest.tcl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 4b94312..22d79e1 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.3.7 + variable Version 2.3.8 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -1991,14 +1991,6 @@ proc tcltest::test {name description args} { } } - # Always run the cleanup script - set code [catch {uplevel 1 $cleanup} cleanupMsg] - if {$code == 1} { - set errorInfo(cleanup) $::errorInfo - set errorCode(cleanup) $::errorCode - } - set cleanupFailure [expr {$code != 0}] - set coreFailure 0 set coreMsg "" # check for a core file first - if one was created by the test, @@ -2076,6 +2068,14 @@ proc tcltest::test {name description args} { set scriptFailure 1 } + # Always run the cleanup script + set code [catch {uplevel 1 $cleanup} cleanupMsg] + if {$code == 1} { + set errorInfo(cleanup) $::errorInfo + set errorCode(cleanup) $::errorCode + } + set cleanupFailure [expr {$code != 0}] + # if we didn't experience any failures, then we passed variable numTests if {!($setupFailure || $cleanupFailure || $coreFailure |