From 9279d963570329258f3ea022285a9599f121b6cf Mon Sep 17 00:00:00 2001 From: stevenknight Date: Tue, 17 Sep 2002 06:51:03 +0000 Subject: [PATCH] Make sure we can find tools using the PATH specified during Environment() instantiation. git-svn-id: http://scons.tigris.org/svn/scons/trunk@467 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Environment.py | 1 + src/engine/SCons/EnvironmentTests.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index cd7aced3..d8a87a42 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -130,6 +130,7 @@ class Environment: platform(self) if tools is None: tools = ['default'] + apply(self.Replace, (), kw) for tool in tools: if SCons.Util.is_String(tool): tool = SCons.Tool.Tool(tool) diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 21d241d4..33c14e5d 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -625,9 +625,12 @@ class EnvironmentTestCase(unittest.TestCase): env['TOOL1'] = 111 def t2(env, platform): env['TOOL2'] = 222 - env = Environment(tools = [t1, t2]) + def t3(env, platform): + env['AAA'] = env['XYZ'] + env = Environment(tools = [t1, t2, t3], XYZ = 'aaa') assert env['TOOL1'] == 111, env['TOOL1'] assert env['TOOL2'] == 222, env + assert env['AAA'] == 'aaa', env if __name__ == "__main__": suite = unittest.makeSuite(EnvironmentTestCase, 'test_') -- 2.26.2