diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-04-21 15:13:26 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-04-21 15:13:26 (GMT) |
commit | 57f9a905465a6022db0f0033c956afaecadc5d70 (patch) | |
tree | ed317ae6759a0bb9ba2e8a20a93a5f2b6981c876 /test/Builder | |
parent | fcd10ca3c39538542594aec5f894fc00fa58bdb1 (diff) | |
download | SCons-57f9a905465a6022db0f0033c956afaecadc5d70.zip SCons-57f9a905465a6022db0f0033c956afaecadc5d70.tar.gz SCons-57f9a905465a6022db0f0033c956afaecadc5d70.tar.bz2 |
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.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py index 9a428a2..707a7e7 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, |