diff options
| author | das <das> | 2007-01-19 01:05:49 (GMT) |
|---|---|---|
| committer | das <das> | 2007-01-19 01:05:49 (GMT) |
| commit | 690f5c8195ae88f99ecac399e39ab6f2b3c0465b (patch) | |
| tree | b2b9c20e338ad125a57c7b21002cd723febbec04 /tests/env.test | |
| parent | 021ed85823b1ff89bf759905a46d700de9744b6b (diff) | |
| download | tcl-690f5c8195ae88f99ecac399e39ab6f2b3c0465b.zip tcl-690f5c8195ae88f99ecac399e39ab6f2b3c0465b.tar.gz tcl-690f5c8195ae88f99ecac399e39ab6f2b3c0465b.tar.bz2 | |
* macosx/tclMacOSXNotify.c: accommodate changes to prototypes of
OSSpinLock(Un)Lock API.
* tests/env.test: add extra system env vars that need to be preserved
on some Mac OS X versions for testsuite to work.
* unix/tcl.m4: ensure CPPFLAGS env var is used when set. [Bug 1586861]
(Darwin): add -isysroot and -mmacosx-version-min flags to CPPFLAGS when
present in CFLAGS to avoid discrepancies between what headers configure
sees during preprocessing tests and compiling tests.
* unix/configure: autoconf-2.13
Diffstat (limited to 'tests/env.test')
| -rw-r--r-- | tests/env.test | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/env.test b/tests/env.test index 7653b05..3afa439 100644 --- a/tests/env.test +++ b/tests/env.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: env.test,v 1.17.2.4 2006/06/14 15:21:14 patthoyts Exp $ +# RCS: @(#) $Id: env.test,v 1.17.2.5 2007/01/19 01:05:50 das Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -75,7 +75,12 @@ set printenvScript [makeFile { lrem names ComSpec lrem names "" } - foreach name {TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY SHLIB_PATH DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH __CF_USER_TEXT_ENCODING SYSTEMDRIVE SYSTEMROOT} { + foreach name { + TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY + SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING + __CF_USER_TEXT_ENCODING SECURITYSESSIONID + } { lrem names $name } foreach p $names { @@ -105,10 +110,14 @@ foreach name [array names env] { # Added the following lines so that child tcltest can actually find its # library if the initial tcltest is run from a non-standard place. # ('saved' env vars) -foreach name {TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH SYSTEMDRIVE SYSTEMROOT} { - if {[info exists env2($name)]} { - set env($name) $env2($name); - } +foreach name { + TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH + SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING + SECURITYSESSIONID} { + if {[info exists env2($name)]} { + set env($name) $env2($name); + } } test env-2.1 {adding environment variables} {exec} { |