* 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.

4 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d025ac7..70240cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-09-11  Don Porter  <dgp@users.sourceforge.net>
 
+	* 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.
+
 	* doc/package.n:	Restored the functioning of
 	* generic/tclPkg.c:	[package require -exact] to be compatible
 	* tests/pkg.test:	with Tcl 8.4.  [Bug 1578344].
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"
 	    }
diff --git a/tests/info.test b/tests/info.test
index 94db6e7..12fd713 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: info.test,v 1.45 2007/06/12 12:34:04 dkf Exp $
+# RCS: @(#) $Id: info.test,v 1.46 2007/09/11 21:26:26 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -761,7 +761,7 @@ test info-22.6 {info frame, global, relative} {!singleTestInterp} {
 test info-22.7 {info frame, global, absolute} {!singleTestInterp} {
     reduce [info frame 1]
 } {type source line 761 file info.test cmd test\ info-22.7\ \{info\ frame,\ global,\ absolute\}\ \{!singleTestInter level 0}
-test info-22.8 {info frame, basic trace} {!singleTestInterp} {
+test info-22.8 {info frame, basic trace} {knownBug !singleTestInterp} {
     join [etrace] \n
 } {8 {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}
 7 {type eval line 2 cmd etrace}
@@ -795,7 +795,7 @@ test info-23.5 {eval'd info frame, dynamic} {
     set script {info frame 0}
     eval $script
 } {type eval line 1 cmd {info frame 0}}
-test info-23.6 {eval'd info frame, trace} {!singleTestInterp} {
+test info-23.6 {eval'd info frame, trace} {knownBug !singleTestInterp} {
     set script {etrace}
     join [eval $script] \n
 } {9 {type source line 728 file info.test cmd {info frame $level} proc ::etrace level 0}