diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-06-20 20:21:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-06-20 20:21:50 (GMT) |
| commit | e69901045e82f866693fcb6716831418846e2bac (patch) | |
| tree | 53f54e7252576d6600797e9c2026bb25c909aea2 /library | |
| parent | 871b2c750d594d61b15d9fcd809dd50633ad881c (diff) | |
| download | tcl-e69901045e82f866693fcb6716831418846e2bac.zip tcl-e69901045e82f866693fcb6716831418846e2bac.tar.gz tcl-e69901045e82f866693fcb6716831418846e2bac.tar.bz2 | |
ticket [2f9df4c4fa]: tcltest - request to move -cleanup script execution until after -output compare
Diffstat (limited to 'library')
| -rw-r--r-- | library/tcltest/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index c99ad2a..987725f 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.3.7 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.3.8 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 4b94312..7dd969b 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,6 +1991,12 @@ proc tcltest::test {name description args} { } } + # check if the return code matched the expected return code + set codeFailure 0 + if {!$setupFailure && ($returnCode ni $returnCodes)} { + set codeFailure 1 + } + # Always run the cleanup script set code [catch {uplevel 1 $cleanup} cleanupMsg] if {$code == 1} { @@ -2032,12 +2038,6 @@ proc tcltest::test {name description args} { } } - # check if the return code matched the expected return code - set codeFailure 0 - if {!$setupFailure && ($returnCode ni $returnCodes)} { - set codeFailure 1 - } - # If expected output/error strings exist, we have to compare # them. If the comparison fails, then so did the test. set outputFailure 0 |