diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-11 21:18:40 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-11 21:18:40 (GMT) |
| commit | 31db1293d7001f8e7aeb25c06df292f43db1154e (patch) | |
| tree | a9e627623722c38b832570e784c9239312534785 /library | |
| parent | 7d84381bfcf3014790c83d13caa0dd5fcf16af5e (diff) | |
| download | tcl-31db1293d7001f8e7aeb25c06df292f43db1154e.zip tcl-31db1293d7001f8e7aeb25c06df292f43db1154e.tar.gz tcl-31db1293d7001f8e7aeb25c06df292f43db1154e.tar.bz2 | |
* library/tcltest/tcltest.tcl: Accept underscores and colons in
* library/tcltest/pkgIndex.tcl: constraint names. Properly handle
constraint expressions that return non-numeric boolean results like
"false". Bump to tcltest 2.2.9. [Bug 1772989; RFE 1071322]
Diffstat (limited to 'library')
| -rw-r--r-- | library/tcltest/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index 1aa4a46..ec0ef1f 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.3]} {return} -package ifneeded tcltest 2.2.8 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.2.9 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 4e42932..b78c822 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.13 2005/02/24 18:03:36 dgp Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.78.2.14 2007/09/11 21:18:42 dgp Exp $ package require Tcl 8.3 ;# uses [glob -directory] namespace eval tcltest { @@ -24,7 +24,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.2.8 + variable Version 2.2.9 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -2222,7 +2222,7 @@ proc tcltest::Skipped {name constraints} { if {[string match {*[$\[]*} $constraints] != 0} { # full expression, e.g. {$foo > [info tclversion]} catch {set doTest [uplevel #0 expr $constraints]} - } elseif {[regexp {[^.a-zA-Z0-9 \n\r\t]+} $constraints] != 0} { + } elseif {[regexp {[^.:_a-zA-Z0-9 \n\r\t]+} $constraints] != 0} { # something like {a || b} should be turned into # $testConstraints(a) || $testConstraints(b). regsub -all {[.\w]+} $constraints {$testConstraints(&)} c @@ -2243,7 +2243,7 @@ proc tcltest::Skipped {name constraints} { } } - if {$doTest == 0} { + if {!$doTest} { if {[IsVerbose skip]} { puts [outputChannel] "++++ $name SKIPPED: $constraints" } |