diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-19 11:43:40 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-19 11:43:40 (GMT) |
commit | c164d719c23ebe8d20d8420dc2345163a36878eb (patch) | |
tree | acb9b00e796181e99a10ffb0d8552cf7318e5a33 /library | |
parent | 35047bd5e543d9e0eaa9ca52914e21104d556f25 (diff) | |
parent | ee58f2d325a281f03cf6669e8d7ae2c377a5af2d (diff) | |
download | tcl-c164d719c23ebe8d20d8420dc2345163a36878eb.zip tcl-c164d719c23ebe8d20d8420dc2345163a36878eb.tar.gz tcl-c164d719c23ebe8d20d8420dc2345163a36878eb.tar.bz2 |
merge main dev branch
Diffstat (limited to 'library')
-rw-r--r-- | library/tcltest/pkgIndex.tcl | 2 | ||||
-rw-r--r-- | library/tcltest/tcltest.tcl | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index 0e4568d..4b0a9bc 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.4 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.3.5 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 02da62f..83ec9d3 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.4 + variable Version 2.3.5 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -601,7 +601,9 @@ namespace eval tcltest { } } proc configure args { - RemoveAutoConfigureTraces + if {[llength $args] > 1} { + RemoveAutoConfigureTraces + } set code [catch {Configure {*}$args} msg] return -code $code $msg } |