From 3237ab14ff96567c91d998c2602009785bc58792 Mon Sep 17 00:00:00 2001 From: czoido Date: Thu, 24 Oct 2024 08:01:56 +0200 Subject: [PATCH] use 194 instead of 193 as we have vs 17.11 v144 installed --- test/functional/toolchains/cmake/test_cmake_toolchain.py | 4 ++-- test/functional/toolchains/microsoft/test_vcvars.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py index efb07d37514..972c4a01555 100644 --- a/test/functional/toolchains/cmake/test_cmake_toolchain.py +++ b/test/functional/toolchains/cmake/test_cmake_toolchain.py @@ -631,7 +631,7 @@ def test_cmake_toolchain_winsdk_version(self): cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \ '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")' client.save({"CMakeLists.txt": cmake}) - client.run("create . -s arch=x86_64 -s compiler.version=193 " + client.run("create . -s arch=x86_64 -s compiler.version=194 " "-c tools.microsoft:winsdk_version=10.0") assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out @@ -649,7 +649,7 @@ def test_cmake_toolchain_winsdk_version2(self): cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \ '${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")' client.save({"CMakeLists.txt": cmake}) - client.run("create . -s arch=x86_64 -s compiler.version=193 " + client.run("create . -s arch=x86_64 -s compiler.version=194 " "-c tools.microsoft:winsdk_version=10.0 " '-c tools.cmake.cmaketoolchain:generator="Visual Studio 17"') assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out diff --git a/test/functional/toolchains/microsoft/test_vcvars.py b/test/functional/toolchains/microsoft/test_vcvars.py index 6a48a340976..7ecaf00bceb 100644 --- a/test/functional/toolchains/microsoft/test_vcvars.py +++ b/test/functional/toolchains/microsoft/test_vcvars.py @@ -17,7 +17,7 @@ class TestConan(ConanFile): settings = "os", "compiler", "arch", "build_type" """) client.save({"conanfile.py": conanfile}) - client.run('install . -s compiler.version=193') + client.run('install . -s compiler.version=194') client.run_command(r'conanbuild.bat') assert "[vcvarsall.bat] Environment initialized" in client.out client.run_command(r'deactivate_conanvcvars.bat')