diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-11 21:26:25 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-11 21:26:25 (GMT) |
| commit | d30c9675dd147e8905633d5e8545106d75a4dc58 (patch) | |
| tree | 365b25cf1886c9abef9a2ad5871a2c20eea2169f /library/tcltest | |
| parent | 05d4bff61c4b959be0020c6a2b74a82cddb1e71e (diff) | |
| download | tcl-d30c9675dd147e8905633d5e8545106d75a4dc58.zip tcl-d30c9675dd147e8905633d5e8545106d75a4dc58.tar.gz tcl-d30c9675dd147e8905633d5e8545106d75a4dc58.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.3b1. [Bug 1772989; RFE 1071322]
* tests/info.test: Disable fragile tests.
Diffstat (limited to 'library/tcltest')
| -rw-r--r-- | library/tcltest/pkgIndex.tcl | 3 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index 80991ab..a5c8778 100644 --- a/library/tcltest/pkgIndex.tcl +++ b/library/tcltest/pkgIndex.tcl @@ -9,5 +9,4 @@ # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.5]} {return} -if {![package vsatisfies [package provide Tcl] 8.3]} {return} -package ifneeded tcltest 2.3a1 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.3b1 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 1469b25..1aafd3a 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -16,16 +16,15 @@ # Contributions from Don Porter, NIST, 2002. (not subject to US copyright) # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.100 2006/12/08 03:37:44 das Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.101 2007/09/11 21:26:26 dgp Exp $ -package require Tcl 8.5 ;# To provide an alpha version -package require Tcl 8.3 ;# uses [glob -directory] +package require Tcl 8.5 ;# -verbose line uses [info frame] 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.3a1 + variable Version 2.3b1 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -2244,7 +2243,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 @@ -2265,7 +2264,7 @@ proc tcltest::Skipped {name constraints} { } } - if {$doTest == 0} { + if {!$doTest} { if {[IsVerbose skip]} { puts [outputChannel] "++++ $name SKIPPED: $constraints" } |