diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/MSVC/msvc_query_version_toolset.py | 1 | ||||
| -rw-r--r-- | test/MSVC/msvc_toolset_versions.py | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/MSVC/msvc_query_version_toolset.py b/test/MSVC/msvc_query_version_toolset.py index 23b8e57..5880f8c 100644 --- a/test/MSVC/msvc_query_version_toolset.py +++ b/test/MSVC/msvc_query_version_toolset.py @@ -44,7 +44,6 @@ from SCons.Tool.MSCommon import MSVCArgumentError class MsvcQueryVersionToolsetTests(unittest.TestCase): def test_valid_default_msvc(self): - symbol = msvc_default_version() for prefer_newest in (True, False): msvc_version, msvc_toolset_version = msvc_query_version_toolset(version=None, prefer_newest=prefer_newest) self.assertTrue(msvc_version, "msvc_version is undefined for msvc version {}".format(repr(None))) diff --git a/test/MSVC/msvc_toolset_versions.py b/test/MSVC/msvc_toolset_versions.py index 1f8d44c..aed0124 100644 --- a/test/MSVC/msvc_toolset_versions.py +++ b/test/MSVC/msvc_toolset_versions.py @@ -34,12 +34,14 @@ test.skip_if_not_msvc() import unittest from SCons.Tool.MSCommon.vc import _VCVER +from SCons.Tool.MSCommon.vc import get_installed_vcs_components from SCons.Tool.MSCommon.vc import msvc_default_version from SCons.Tool.MSCommon import msvc_version_components -from SCons.Tool.MSCommon import msvc_extended_version_components from SCons.Tool.MSCommon import msvc_toolset_versions from SCons.Tool.MSCommon import MSVCArgumentError +installed_versions = get_installed_vcs_components() + class MsvcToolsetVersionsTests(unittest.TestCase): def test_valid_default_msvc(self): @@ -49,7 +51,7 @@ class MsvcToolsetVersionsTests(unittest.TestCase): toolset_full_list = msvc_toolset_versions(msvc_version=None, full=True, sxs=False) toolset_sxs_list = msvc_toolset_versions(msvc_version=None, full=False, sxs=True) toolset_all_list = msvc_toolset_versions(msvc_version=None, full=True, sxs=True) - if version_def.msvc_vernum >= 14.1: + if version_def in installed_versions and version_def.msvc_vernum >= 14.1: # sxs list could be empty self.assertTrue(toolset_full_list, "Toolset full list is empty for msvc version {}".format(repr(None))) self.assertTrue(toolset_all_list, "Toolset all list is empty for msvc version {}".format(repr(None))) @@ -66,7 +68,7 @@ class MsvcToolsetVersionsTests(unittest.TestCase): toolset_full_list = msvc_toolset_versions(msvc_version=symbol, full=True, sxs=False) toolset_sxs_list = msvc_toolset_versions(msvc_version=symbol, full=False, sxs=True) toolset_all_list = msvc_toolset_versions(msvc_version=symbol, full=True, sxs=True) - if version_def.msvc_vernum >= 14.1: + if version_def in installed_versions and version_def.msvc_vernum >= 14.1: # sxs list could be empty self.assertTrue(toolset_full_list, "Toolset full list is empty for msvc version {}".format(repr(symbol))) self.assertTrue(toolset_all_list, "Toolset all list is empty for msvc version {}".format(repr(symbol))) |