diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 3 | ||||
| -rwxr-xr-x | tests/tcltest.test | 11 |
3 files changed, 14 insertions, 8 deletions
@@ -1,9 +1,11 @@ 2004-05-26 Don Porter <dgp@users.sourceforge.net> * library/tcltest/tcltest.tcl: Correction to debug prints and testing - * library/tcltest/pkgIndex.tcl: if TCLTEST_OPTIONS value. Updated - * tests/tcltest.test: tcltest-19.1 to tcltest 2.1 behavior. - Bumped to tcltest 2.2.6. + * library/tcltest/pkgIndex.tcl: if TCLTEST_OPTIONS value. Corrected + * tests/tcltest.test: double increment of numTestFiles in + -singleproc 1 configurations. Updated tcltest-19.1 to tcltest 2.1 + behavior. Corrected tcltest-25.3 to not falsely report a failure + in tcltest.test. Bumped to tcltest 2.2.6. [Bugs 960560, 960926] 2004-05-25 Jeff Hobbs <jeffh@ActiveState.com> diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 5af8b18..85d86db 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -16,7 +16,7 @@ # Contributions from Don Porter, NIST, 2002. (not subject to US copyright) # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.78.2.9 2004/05/26 15:13:49 dgp Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.78.2.10 2004/05/26 16:24:37 dgp Exp $ package require Tcl 8.3 ;# uses [glob -directory] namespace eval tcltest { @@ -2418,7 +2418,6 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} { # then add current file to failFile list if any tests in this # file failed - incr numTestFiles if {$currentFailure \ && ([lsearch -exact $failFiles $testFileName] == -1)} { lappend failFiles $testFileName diff --git a/tests/tcltest.test b/tests/tcltest.test index e4cfc75..42797fa 100755 --- a/tests/tcltest.test +++ b/tests/tcltest.test @@ -6,7 +6,7 @@ # Copyright (c) 2000 by Ajuba Solutions # All rights reserved. # -# RCS: @(#) $Id: tcltest.test,v 1.37.2.3 2004/05/26 15:13:50 dgp Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.37.2.4 2004/05/26 16:24:38 dgp Exp $ # Note that there are several places where the value of # tcltest::currentFailure is stored/reset in the -setup/-cleanup @@ -1725,14 +1725,19 @@ test tcltest-25.2 { test tcltest-25.3 { reported return code (Bug 611922) +} -setup { + set fail $::tcltest::currentFailure + set v [verbose] } -body { - # Buggy tcltest will generate result of 2 + verbose {} test tcltest-25.3.0 {} -body { error foo } +} -cleanup { + set ::tcltest::currentFailure $fail + verbose $v } -match glob -output {*generated error; Return code was: 1*} - cleanupTests } |