diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-24 22:12:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-24 22:12:57 (GMT) |
| commit | 738d6fffd4656d1b1d072ebe1504f259ba503eb6 (patch) | |
| tree | 7cce882d13abfd0bc638d0e6196d9f12c1b48d33 /library/tcltest | |
| parent | 7dafa85d139a21b67055fc0d9a90c640a3ba36be (diff) | |
| parent | be6ed41db2f292c42a40c9e4da6bbc21884a3b54 (diff) | |
| download | tcl-738d6fffd4656d1b1d072ebe1504f259ba503eb6.zip tcl-738d6fffd4656d1b1d072ebe1504f259ba503eb6.tar.gz tcl-738d6fffd4656d1b1d072ebe1504f259ba503eb6.tar.bz2 | |
merge trunk
Diffstat (limited to 'library/tcltest')
| -rw-r--r-- | library/tcltest/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index b253f34..19b6005 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.6 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.3.7 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index f59e25b..55efb3d 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.6 + variable Version 2.3.7 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -2498,17 +2498,15 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} { if {![info exists originalEnv($index)]} { lappend newEnv $index unset ::env($index) - } else { - if {$::env($index) != $originalEnv($index)} { - lappend changedEnv $index - set ::env($index) $originalEnv($index) - } } } foreach index [array names originalEnv] { if {![info exists ::env($index)]} { lappend removedEnv $index set ::env($index) $originalEnv($index) + } elseif {$::env($index) ne $originalEnv($index)} { + lappend changedEnv $index + set ::env($index) $originalEnv($index) } } if {[llength $newEnv] > 0} { |