diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-04 13:40:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-04 13:40:58 (GMT) |
| commit | 4f028801329088a592139290fa378e51d1b5cbb5 (patch) | |
| tree | 7d961335df5e71e809a95641af30e4a7c69d60e4 /library | |
| parent | 2eab5be3ef9be6cc7ec30abf3ea5bf587577e001 (diff) | |
| parent | ae09e66da466ea68e269fc388798ca6ce2cd1c4c (diff) | |
| download | tcl-4f028801329088a592139290fa378e51d1b5cbb5.zip tcl-4f028801329088a592139290fa378e51d1b5cbb5.tar.gz tcl-4f028801329088a592139290fa378e51d1b5cbb5.tar.bz2 | |
merge trunk
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 3769155..fabddb0 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 12692bb..07d0a51 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 } |