diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-17 23:43:09 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-17 23:43:09 (GMT) |
| commit | d7664eb17d902d3540cfcdda226bd55e9c86cdf0 (patch) | |
| tree | d11ed052f84242d45aa8ae6e3c70ccbc2e79a31d /test/MSVC/MSVC_SDK_VERSION.py | |
| parent | f4efe6bcd4694c34c391fe92422b059e3f737e1d (diff) | |
| download | SCons-d7664eb17d902d3540cfcdda226bd55e9c86cdf0.zip SCons-d7664eb17d902d3540cfcdda226bd55e9c86cdf0.tar.gz SCons-d7664eb17d902d3540cfcdda226bd55e9c86cdf0.tar.bz2 | |
Add msvc spectre libs test. Add library path checks to msvc sdk version and msvc toolset version tests.
Diffstat (limited to 'test/MSVC/MSVC_SDK_VERSION.py')
| -rw-r--r-- | test/MSVC/MSVC_SDK_VERSION.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/MSVC/MSVC_SDK_VERSION.py b/test/MSVC/MSVC_SDK_VERSION.py index 4a3537b..1d9f0f4 100644 --- a/test/MSVC/MSVC_SDK_VERSION.py +++ b/test/MSVC/MSVC_SDK_VERSION.py @@ -84,8 +84,11 @@ if GE_VS2015_versions: test.write('SConstruct', textwrap.dedent( """ DefaultEnvironment(tools=[]) - env = Environment(MSVC_VERSION={}, MSVC_SDK_VERSION={}, tools=['msvc']) - """.format(repr(supported.msvc_version), repr(sdk_version)) + env = Environment(MSVC_VERSION={0}, MSVC_SDK_VERSION={1}, tools=['msvc']) + lib_path = env['ENV']['LIB'] + if '\\\\{2}\\\\' not in lib_path: + raise RuntimeError("{1} not found in lib_path " + lib_path) + """.format(repr(supported.msvc_version), repr(sdk_version), sdk_version) )) test.run(arguments='-Q -s', stdout='') @@ -93,8 +96,11 @@ if GE_VS2015_versions: test.write('SConstruct', textwrap.dedent( """ DefaultEnvironment(tools=[]) - env = Environment(MSVC_VERSION={}, MSVC_SCRIPT_ARGS={}, tools=['msvc']) - """.format(repr(supported.msvc_version), repr(sdk_version)) + env = Environment(MSVC_VERSION={0}, MSVC_SCRIPT_ARGS={1}, tools=['msvc']) + lib_path = env['ENV']['LIB'] + if '\\\\{2}\\\\' not in lib_path: + raise RuntimeError("{1} not found in lib_path " + lib_path) + """.format(repr(supported.msvc_version), repr(sdk_version), sdk_version) )) test.run(arguments='-Q -s', stdout='') |