summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-20 16:04:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-20 16:04:43 (GMT)
commitc555e477b12e11467a877024a205f39376477389 (patch)
tree0099110714485257a3ccbd6fe34a3f2934f004a6 /library
parentc6900d988e939fafa1b1800ba27302c378d3e3c2 (diff)
downloadtcl-c555e477b12e11467a877024a205f39376477389.zip
tcl-c555e477b12e11467a877024a205f39376477389.tar.gz
tcl-c555e477b12e11467a877024a205f39376477389.tar.bz2
Safer clean-up of environment variables: Do removal after insertions -> tcltest 2.3.7
Diffstat (limited to 'library')
-rw-r--r--library/tcltest/pkgIndex.tcl2
-rw-r--r--library/tcltest/tcltest.tcl13
2 files changed, 9 insertions, 6 deletions
diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl
index 60a9485..c99ad2a 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 c30d2e4..d066a1b 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]
@@ -2495,16 +2495,19 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
set changedEnv {}
set removedEnv {}
foreach index [array names ::env] {
- if {![info exists originalEnv($index)]} {
- lappend newEnv $index
- unset ::env($index)
- } else {
+ if {[info exists originalEnv($index)]} {
if {$::env($index) != $originalEnv($index)} {
lappend changedEnv $index
set ::env($index) $originalEnv($index)
}
}
}
+ foreach index [array names ::env] {
+ if {![info exists originalEnv($index)]} {
+ lappend newEnv $index
+ unset ::env($index)
+ }
+ }
foreach index [array names originalEnv] {
if {![info exists ::env($index)]} {
lappend removedEnv $index