diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-13 20:23:19 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2022-07-13 20:23:19 (GMT) |
| commit | 744dac6103fed53c29d6957854c995ce99ea5181 (patch) | |
| tree | 67377013c160d6b7246d6a396d4a4f5dc0b2c3ed /SCons | |
| parent | 1365adbda99eeddfee28acbeec0db891cf849ffd (diff) | |
| download | SCons-744dac6103fed53c29d6957854c995ce99ea5181.zip SCons-744dac6103fed53c29d6957854c995ce99ea5181.tar.gz SCons-744dac6103fed53c29d6957854c995ce99ea5181.tar.bz2 | |
Disable new vcTests for non-windows platforms.
Diffstat (limited to 'SCons')
| -rw-r--r-- | SCons/Tool/MSCommon/vcTests.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/SCons/Tool/MSCommon/vcTests.py b/SCons/Tool/MSCommon/vcTests.py index 655d8e1..376a0d5 100644 --- a/SCons/Tool/MSCommon/vcTests.py +++ b/SCons/Tool/MSCommon/vcTests.py @@ -24,6 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import sys import os import os.path import unittest @@ -239,6 +240,7 @@ class MSVcTestCase(unittest.TestCase): self.fail('Did not fail when TARGET_ARCH specified as: %s' % env['TARGET_ARCH']) +@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows") class MsvcSdkVersionsTests(unittest.TestCase): def test_valid_default_msvc(self): @@ -288,10 +290,18 @@ class MsvcSdkVersionsTests(unittest.TestCase): _ = MSCommon.vc.msvc_sdk_versions(version=symbol, msvc_uwp_app=msvc_uwp_app) -installed_vcs_components = MSCommon.vc.get_installed_vcs_components() - +@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows") class MsvcToolsetVersionsTests(unittest.TestCase): + _installed_vcs_components = None + + @classmethod + def setUpClass(cls): + cls._installed_vcs_components = MSCommon.vc.get_installed_vcs_components() + + def setUp(self): + self.installed_vcs_components = self.__class__._installed_vcs_components + def test_valid_default_msvc(self): symbol = MSCommon.vc.msvc_default_version() version_def = MSCommon.msvc_version_components(symbol) @@ -299,7 +309,7 @@ class MsvcToolsetVersionsTests(unittest.TestCase): toolset_full_list = MSCommon.vc.msvc_toolset_versions(msvc_version=None, full=True, sxs=False) toolset_sxs_list = MSCommon.vc.msvc_toolset_versions(msvc_version=None, full=False, sxs=True) toolset_all_list = MSCommon.vc.msvc_toolset_versions(msvc_version=None, full=True, sxs=True) - if version_def in installed_vcs_components and version_def.msvc_vernum >= 14.1: + if version_def in self.installed_vcs_components 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))) @@ -316,7 +326,7 @@ class MsvcToolsetVersionsTests(unittest.TestCase): toolset_full_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=True, sxs=False) toolset_sxs_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=False, sxs=True) toolset_all_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=True, sxs=True) - if version_def in installed_vcs_components and version_def.msvc_vernum >= 14.1: + if version_def in self.installed_vcs_components 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))) @@ -332,6 +342,7 @@ class MsvcToolsetVersionsTests(unittest.TestCase): _ = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol) +@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows") class MsvcQueryVersionToolsetTests(unittest.TestCase): def test_valid_default_msvc(self): |