diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-09 14:49:53 -0400 |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-09 14:49:53 -0400 |
| commit | 04a5dea1a00abd7ffdc4c274f000273ce6ff37db (patch) | |
| tree | de73f1079176391dae6b9084d19effa9b7657dd8 /test/fixture | |
| parent | 23f63fc766f9e157bfe8642b8559983dde684dd3 (diff) | |
| download | scons-git-04a5dea1a00abd7ffdc4c274f000273ce6ff37db.tar.gz | |
Rework version convenience functions. Add additional tests.
Diffstat (limited to 'test/fixture')
| -rw-r--r-- | test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py | 15 | ||||
| -rw-r--r-- | test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py new file mode 100644 index 000000000..62e77ab19 --- /dev/null +++ b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.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 + +sdk_version_list = SCons.Tool.MSCommon.msvc_sdk_versions() + +print('sdk_version_list='+repr(sdk_version_list))
\ No newline at end of file diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py new file mode 100644 index 000000000..3aec559b4 --- /dev/null +++ b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.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 + +toolset_version_list = SCons.Tool.MSCommon.msvc_toolset_versions() + +print('toolset_version_list='+repr(toolset_version_list))
\ No newline at end of file |