diff options
| author | William Deegan <bill@baddogconsulting.com> | 2021-09-18 23:39:15 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2021-09-18 23:48:01 (GMT) |
| commit | a2fb73003f7c664782ffc16aa19cfadf8f2af56b (patch) | |
| tree | b03ba6d47509f63dc9ad3e64d07d2cef741c26bd /test | |
| parent | 7d06a82467097fee7178d3d41414a6fa8781cd62 (diff) | |
| download | SCons-a2fb73003f7c664782ffc16aa19cfadf8f2af56b.zip SCons-a2fb73003f7c664782ffc16aa19cfadf8f2af56b.tar.gz SCons-a2fb73003f7c664782ffc16aa19cfadf8f2af56b.tar.bz2 | |
fix remaining PCH tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/MSVC/hierarchical.py | 4 | ||||
| -rw-r--r-- | test/MSVC/pch-spaces-subdir.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py index 0b19483..a162e98 100644 --- a/test/MSVC/hierarchical.py +++ b/test/MSVC/hierarchical.py @@ -37,17 +37,15 @@ test.skip_if_not_msvc() test.subdir('src', 'build', 'out') test.write('SConstruct', """ +DefaultEnvironment(tools=[]) VariantDir('build', 'src', duplicate=0) SConscript('build/SConscript') """) test.write('src/SConscript',""" -import os # TODO: this is order-dependent (putting 'mssdk' second or third breaks), # and ideally we shouldn't need to specify the tools= list anyway. env = Environment(tools=['mssdk', 'msvc', 'mslink']) -env.Append(CPPPATH=os.environ.get('INCLUDE', ''), - LIBPATH=os.environ.get('LIB', '')) env['PCH'] = 'StdAfx.pch' env['PDB'] = '#out/test.pdb' env['PCHSTOP'] = 'StdAfx.h' diff --git a/test/MSVC/pch-spaces-subdir.py b/test/MSVC/pch-spaces-subdir.py index f00fac1..a55d8b7 100644 --- a/test/MSVC/pch-spaces-subdir.py +++ b/test/MSVC/pch-spaces-subdir.py @@ -62,6 +62,7 @@ SConscript('SConscript', variant_dir='Release Output', duplicate=0) """) test.write('SConscript', """\ +DefaultEnvironment(tools=[]) env = Environment() env['PCHSTOP'] = 'Precompiled.h' |