diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-18 04:05:02 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-04-18 04:05:02 +0530 |
| commit | 2c2b2acec54d2791789660f51a1cebb266e5d6ac (patch) | |
| tree | 109e32d87ab6cffab4b3dcf1e56269774e281896 | |
| parent | e91dd1fe6550a2835de8e961119e3f2cf4695b9b (diff) | |
| download | meson-vs2019-toolset.tar.gz | |
unit tests: Skip toolset version test on VS2015 and oldervs2019-toolset
| -rwxr-xr-x | run_unittests.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py index b28eab287..941280d6d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -968,6 +968,9 @@ class InternalTests(unittest.TestCase): raise unittest.SkipTest('Test only applies to MSVC-like compilers') toolset_ver = cc.get_toolset_version() self.assertIsNotNone(toolset_ver) + # Visual Studio 2015 and older versions do not define VCToolsVersion + if int(''.join(cc.version.split('.')[0:2])) < 1910: + return self.assertIn('VCToolsVersion', os.environ) vctools_ver = os.environ['VCToolsVersion'] self.assertTrue(vctools_ver.startswith(toolset_ver), |