diff options
author | Daniel <dmoody256@gmail.com> | 2019-02-04 21:21:16 -0600 |
---|---|---|
committer | Daniel <dmoody256@gmail.com> | 2019-02-04 21:21:16 -0600 |
commit | 68069af22c502e61439b006a1c6e0d2431f20949 (patch) | |
tree | db69729fb882a1eaa8c0a9037861f1be2b1599a0 /test/fixture | |
parent | 5e859ac7a1aee773e23679ffdeaabdd4a957cf4c (diff) | |
download | scons-git-68069af22c502e61439b006a1c6e0d2431f20949.tar.gz |
fix for case where nothing is return from vswhere
Diffstat (limited to 'test/fixture')
-rw-r--r-- | test/fixture/no_msvc/no_msvcs_sconstruct.py | 15 | ||||
-rw-r--r-- | test/fixture/no_msvc/no_regs_sconstruct.py | 7 |
2 files changed, 22 insertions, 0 deletions
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct.py b/test/fixture/no_msvc/no_msvcs_sconstruct.py new file mode 100644 index 000000000..e0b59e6aa --- /dev/null +++ b/test/fixture/no_msvc/no_msvcs_sconstruct.py @@ -0,0 +1,15 @@ +import SCons +import SCons.Tool.MSCommon + +def DummyVsWhere(msvc_version): + # 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 + +env = SCons.Environment.Environment() + +print('MSVC_VERSION='+str(env.get('MSVC_VERSION')))
\ No newline at end of file diff --git a/test/fixture/no_msvc/no_regs_sconstruct.py b/test/fixture/no_msvc/no_regs_sconstruct.py new file mode 100644 index 000000000..3eeca9408 --- /dev/null +++ b/test/fixture/no_msvc/no_regs_sconstruct.py @@ -0,0 +1,7 @@ +import SCons +import SCons.Tool.MSCommon + +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'')] + +env = SCons.Environment.Environment()
\ No newline at end of file |