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/VariantDir | |
| 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/VariantDir')
| -rw-r--r-- | test/VariantDir/reflect.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py index 51a1bc8..e7ff6db 100644 --- a/test/VariantDir/reflect.py +++ b/test/VariantDir/reflect.py @@ -90,9 +90,9 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2', 'dir1', 'dir2_CNI')) # The .+ after mycc\\.py below handles /nologo flags from Visual C/C++. expect = test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* +%(re_python)s mycc\\.py.* %(INC_CNI)s.* Compile -"%(re_python)s" mylink\\.py .+ +%(re_python)s mylink\\.py .+ Link """ % locals()) @@ -120,9 +120,9 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2_CNI')) test.run(arguments = '', stdout=test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* +%(re_python)s mycc\\.py.* %(INC_CNI)s.* Compile -"%(re_python)s" mylink\\.py .+ +%(re_python)s mylink\\.py .+ Link """ % locals()), match=TestSCons.match_re, |