summaryrefslogtreecommitdiffstats
path: root/test/MSVC/MSVC_SDK_VERSION.py
diff options
context:
space:
mode:
authorJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-07-18 07:17:42 (GMT)
committerJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-07-18 07:17:42 (GMT)
commit32bfd79a27f2c28f8b8feea396e1636c55fa0f28 (patch)
tree009731e798d2942191580cdb2289f247c6e4cf69 /test/MSVC/MSVC_SDK_VERSION.py
parentd7664eb17d902d3540cfcdda226bd55e9c86cdf0 (diff)
downloadSCons-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_SDK_VERSION.py')
-rw-r--r--test/MSVC/MSVC_SDK_VERSION.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/MSVC/MSVC_SDK_VERSION.py b/test/MSVC/MSVC_SDK_VERSION.py
index 1d9f0f4..62eaf6e 100644
--- a/test/MSVC/MSVC_SDK_VERSION.py
+++ b/test/MSVC/MSVC_SDK_VERSION.py
@@ -87,7 +87,7 @@ if GE_VS2015_versions:
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)
+ 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='')
@@ -99,7 +99,7 @@ if GE_VS2015_versions:
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)
+ 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='')