diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/hash/sha1/sha1_x86/info.txt | 2 | ||||
-rw-r--r-- | src/lib/hash/sha2_32/sha2_32_x86/info.txt | 2 | ||||
-rwxr-xr-x | src/scripts/python_uniitests.py | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/hash/sha1/sha1_x86/info.txt b/src/lib/hash/sha1/sha1_x86/info.txt index fa329ae77..9cddd40a2 100644 --- a/src/lib/hash/sha1/sha1_x86/info.txt +++ b/src/lib/hash/sha1/sha1_x86/info.txt @@ -7,5 +7,5 @@ need_isa sha,ssse3,sse4.1 <cc> clang:3.9 gcc:5.0 -msvc:2015 +msvc:19.0 # MSVS 2015 </cc> diff --git a/src/lib/hash/sha2_32/sha2_32_x86/info.txt b/src/lib/hash/sha2_32/sha2_32_x86/info.txt index c0b159ab2..bf34e73a3 100644 --- a/src/lib/hash/sha2_32/sha2_32_x86/info.txt +++ b/src/lib/hash/sha2_32/sha2_32_x86/info.txt @@ -7,5 +7,5 @@ need_isa sha,sse4.1 <cc> gcc:5.0 clang:3.9 -msvc:2015 +msvc:19.0 # MSVS 2015 </cc> diff --git a/src/scripts/python_uniitests.py b/src/scripts/python_uniitests.py index f7b1bc97e..0f41f3afa 100755 --- a/src/scripts/python_uniitests.py +++ b/src/scripts/python_uniitests.py @@ -88,7 +88,13 @@ Selected multilib: .;@m64""" 1900 """ - self.assertEqual(detector.version_from_compiler_output(compiler_out), "2015") + self.assertEqual(detector.version_from_compiler_output(compiler_out), "19.0") + + compiler_out = """msvc_version.c + +1910 +""" + self.assertEqual(detector.version_from_compiler_output(compiler_out), "19.10") class ModulesChooserResolveDependencies(unittest.TestCase): |