summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-09-17 06:51:03 (GMT)
committerSteven Knight <knight@baldmt.com>2002-09-17 06:51:03 (GMT)
commit72042342ebcbc24c523fb4e1413821c73e585a2a (patch)
tree05f0d86550ef1a5f38cadf1a2fc463526b796602 /src/engine
parentb04744713085a486615cbef5f489dc522988fb36 (diff)
downloadSCons-72042342ebcbc24c523fb4e1413821c73e585a2a.zip
SCons-72042342ebcbc24c523fb4e1413821c73e585a2a.tar.gz
SCons-72042342ebcbc24c523fb4e1413821c73e585a2a.tar.bz2
Make sure we can find tools using the PATH specified during Environment() instantiation.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Environment.py1
-rw-r--r--src/engine/SCons/EnvironmentTests.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index cd7aced..d8a87a4 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 21d241d..33c14e5 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_')