summaryrefslogtreecommitdiff
path: root/test/Builder
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-04-21 15:13:26 +0000
committerGreg Noel <GregNoel@tigris.org>2010-04-21 15:13:26 +0000
commit237b88a5c911997f047d17780796b995476c0eab (patch)
treeed317ae6759a0bb9ba2e8a20a93a5f2b6981c876 /test/Builder
parent000e16d5d8d90971d76022e6d4d8e7cd9055363a (diff)
downloadscons-237b88a5c911997f047d17780796b995476c0eab.tar.gz
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Pass the python executable from the -P option to runtest to TestCmd.py. Create the escaped executable name in TestCmd.py as well. Pass those two values into derived test modules. Fix cascade problems in test scripts due to incorrect assumptions about the name of the executable.
Diffstat (limited to 'test/Builder')
-rw-r--r--test/Builder/multi/same-overrides.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py
index 9a428a27..707a7e72 100644
--- a/test/Builder/multi/same-overrides.py
+++ b/test/Builder/multi/same-overrides.py
@@ -54,8 +54,8 @@ env.B(target = 'file4.out', source = 'file4b.in', foo=3)
test.write('file4a.in', 'file4a.in\n')
test.write('file4b.in', 'file4b.in\n')
-python_expr = TestSCons.python.replace('\\', '\\\\')
-act = TestSCons.re_escape('"%s" build.py \$foo \$TARGET \$SOURCES' % python_expr)
+python_expr = _python_.replace('\\', '\\\\')
+act = TestSCons.re_escape('%s build.py \$foo \$TARGET \$SOURCES' % python_expr)
expect = ("""
scons: warning: Two different environments were specified for target file4.out,