wip

conan-io · Oct 23, 2024 · c87bf06 · c87bf06
1 parent 68c589a
commit c87bf06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
@@ -86,7 +86,7 @@ def test_clang_mingw(self, client, runtime):
         assert 'cmake -G "MinGW Makefiles"' in client.out
         assert "GNU-like command-line" in client.out
         assert "main __clang_major__17" in client.out
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
@@ -107,7 +107,7 @@ def test_clang_cmake_ninja_nmake(self, client, generator):
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "GNU-like command-line" in client.out
         assert "main __clang_major__17" in client.out
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2014" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out
@@ -157,7 +157,7 @@ def test_clang_visual_studio_generator(self, client):
         # My local is 17, but CI ClangCL still 16
         assert "main __clang_major__17" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER193" in client.out
+        assert "main _MSC_VER1941" in client.out
         assert "main _MSVC_LANG2017" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out

diff --git a/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
@@ -49,11 +49,11 @@ def test_msbuild_lib_2022():
     assert "hello/0.1: _MSC_VER191" in client.out
 
     # Create works
-    client.run("create . -s compiler.version=193")
+    client.run("create . -s compiler.version=194")
     assert "hello/0.1: Hello World Release!" in client.out
     # This is the default compiler.version=191 in conftest
     assert "Activating environment Visual Studio 17" in client.out
-    assert "hello/0.1: _MSC_VER193" in client.out
+    assert "hello/0.1: _MSC_VER1941" in client.out
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")