diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-18 07:17:42 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-18 07:17:42 (GMT) |
| commit | 32bfd79a27f2c28f8b8feea396e1636c55fa0f28 (patch) | |
| tree | 009731e798d2942191580cdb2289f247c6e4cf69 /test/MSVC/MSVC_TOOLSET_VERSION.py | |
| parent | d7664eb17d902d3540cfcdda226bd55e9c86cdf0 (diff) | |
| download | SCons-32bfd79a27f2c28f8b8feea396e1636c55fa0f28.zip SCons-32bfd79a27f2c28f8b8feea396e1636c55fa0f28.tar.gz SCons-32bfd79a27f2c28f8b8feea396e1636c55fa0f28.tar.bz2 | |
Add special case for msvc 14.0 and store/uwp specified via script args and sdk specified via construction variable or forced. Revise forced default toolset handling (may have passed default toolset as an argument inadvertently). Add more tests.
Diffstat (limited to 'test/MSVC/MSVC_TOOLSET_VERSION.py')
| -rw-r--r-- | test/MSVC/MSVC_TOOLSET_VERSION.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/MSVC/MSVC_TOOLSET_VERSION.py b/test/MSVC/MSVC_TOOLSET_VERSION.py index b016147..01d43b1 100644 --- a/test/MSVC/MSVC_TOOLSET_VERSION.py +++ b/test/MSVC/MSVC_TOOLSET_VERSION.py @@ -64,7 +64,7 @@ if GE_VS2017_versions: env = Environment(MSVC_VERSION={0}, MSVC_TOOLSET_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) + raise RuntimeError("{1} not found in lib path " + lib_path) """.format(repr(supported.msvc_version), repr(toolset_full_version), toolset_full_version) )) test.run(arguments='-Q -s', stdout='') @@ -76,7 +76,7 @@ if GE_VS2017_versions: env = Environment(MSVC_VERSION={0}, MSVC_SCRIPT_ARGS='-vcvars_ver={1}', tools=['msvc']) lib_path = env['ENV']['LIB'] if '\\\\{1}\\\\' not in lib_path: - raise RuntimeError("'{1}' not found in lib_path " + lib_path) + raise RuntimeError("'{1}' not found in lib path " + lib_path) """.format(repr(supported.msvc_version), toolset_full_version) )) test.run(arguments='-Q -s', stdout='') |