summaryrefslogtreecommitdiff
path: root/test/fixture
diff options
context:
space:
mode:
authorJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-07-10 08:33:29 -0400
committerJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-07-10 08:33:29 -0400
commitea10a376827411956f9035c91933e1016256e37f (patch)
treec36db47a456e1f6f417cb314ff5085b46063f6c9 /test/fixture
parent0d85fd2b2a92f27dbb45e2c974de73c5943f573e (diff)
downloadscons-git-ea10a376827411956f9035c91933e1016256e37f.tar.gz
Modify msvc_query_version_toolset when version is None to use default version. Add additional tests.
Diffstat (limited to 'test/fixture')
-rw-r--r--test/fixture/no_msvc/no_msvcs_sconstruct_msvc_query_toolset_version.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_query_toolset_version.py b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_query_toolset_version.py
new file mode 100644
index 000000000..8e3c65fbc
--- /dev/null
+++ b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_query_toolset_version.py
@@ -0,0 +1,15 @@
+import SCons
+import SCons.Tool.MSCommon
+
+def DummyVsWhere(msvc_version, env):
+ # not testing versions with vswhere, so return none
+ return None
+
+for key in SCons.Tool.MSCommon.vc._VCVER_TO_PRODUCT_DIR:
+ SCons.Tool.MSCommon.vc._VCVER_TO_PRODUCT_DIR[key]=[(SCons.Util.HKEY_LOCAL_MACHINE, r'')]
+
+SCons.Tool.MSCommon.vc.find_vc_pdir_vswhere = DummyVsWhere
+
+msvc_version, msvc_toolset_version = SCons.Tool.MSCommon.msvc_query_version_toolset()
+
+print('msvc_version={}, msvc_toolset_version={}'.format(repr(msvc_version), repr(msvc_toolset_version))) \ No newline at end of file