summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-07 21:21:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-10-07 21:21:58 (GMT)
commitb5ef14e4f16a379a7bfe4af4b6ec0a3076856b8d (patch)
tree5d638a4e8ae01aa10cf75e9a6ccf1e07beaf4c5b
parentd4ee121318a88eea4cb0e445c97caa75c2b05967 (diff)
parent60a0f32055ec6d3f76e3261646cfe1b63c688a4a (diff)
downloadtcl-b5ef14e4f16a379a7bfe4af4b6ec0a3076856b8d.zip
tcl-b5ef14e4f16a379a7bfe4af4b6ec0a3076856b8d.tar.gz
tcl-b5ef14e4f16a379a7bfe4af4b6ec0a3076856b8d.tar.bz2
Fix env.test, when running under wine 1.3
-rw-r--r--ChangeLog2
-rw-r--r--tests/env.test3
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ab40da6..74aa3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* generic/tcl.h: Fix gcc warnings (discovered with
* generic/tclIORChan.c: latest mingw, based on gcc 4.6.1)
+ * tests/env.test: Fix env.test, when running
+ under wine 1.3
2011-10-06 Donal K. Fellows <dkf@users.sf.net>
diff --git a/tests/env.test b/tests/env.test
index 9c417d9..9010f52 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -89,6 +89,7 @@ set printenvScript [makeFile {
SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
+ CommonProgramFiles ProgramFiles
} {
lrem names $name
}
@@ -97,6 +98,7 @@ set printenvScript [makeFile {
}
exit
} printenv]
+
# [exec] is required here to see the actual environment received by child
# processes.
proc getenv {} {
@@ -119,6 +121,7 @@ foreach name [array names env] {
SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
SECURITYSESSIONID LANG WINDIR TERM
+ CommonProgramFiles ProgramFiles
}} {
unset env($name)
}