Skip to content

Commit 2105dba

Browse files
wip
1 parent 75e06ea commit 2105dba

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

test/conftest.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@
6868
'cmake': {
6969
"default": "4.0.0-rc3",
7070
"3.15": {
71-
"path": {'Windows': 'C:/tools/cmake/4.0.0-rc3/cmake-4.0.0-rc3-windows-x86_64/bin',
72-
'Darwin': '/Users/runner/Applications/CMake/4.0.0-rc3/bin',
73-
'Linux': "/usr/share/cmake-4.0.0-rc3/bin"}
71+
"path": {'Windows': 'C:/tools/cmake/3.15.7/cmake-3.15.7-win64-x64/bin',
72+
'Darwin': '/Users/runner/Applications/CMake/3.15.7/bin',
73+
'Linux': '/usr/share/cmake-3.15.7/bin'}
7474
},
7575
"3.19": {
76-
"path": {'Windows': 'C:/tools/cmake/4.0.0-rc3/cmake-4.0.0-rc3-windows-x86_64/bin',
77-
'Darwin': '/Users/runner/Applications/CMake/4.0.0-rc3/bin',
78-
'Linux': "/usr/share/cmake-4.0.0-rc3/bin"}
76+
"path": {'Windows': 'C:/tools/cmake/3.19.7/cmake-3.19.7-win64-x64/bin',
77+
'Darwin': '/Users/runner/Applications/CMake/3.19.7/bin',
78+
'Linux': '/usr/share/cmake-3.19.7/bin'}
7979
},
8080
"3.23": {
81-
"path": {'Windows': 'C:/tools/cmake/4.0.0-rc3/cmake-4.0.0-rc3-windows-x86_64/bin',
82-
'Darwin': '/Users/runner/Applications/CMake/4.0.0-rc3/bin',
83-
'Linux': "/usr/share/cmake-4.0.0-rc3/bin"}
81+
"path": {'Windows': 'C:/tools/cmake/3.23.5/cmake-3.23.5-windows-x86_64/bin',
82+
'Darwin': '/Users/runner/Applications/CMake/3.23.5/bin',
83+
'Linux': "/usr/share/cmake-3.23.5/bin"}
8484
},
8585
"3.27": {
86-
"path": {'Windows': 'C:/tools/cmake/4.0.0-rc3/cmake-4.0.0-rc3-windows-x86_64/bin',
87-
'Darwin': '/Users/runner/Applications/CMake/4.0.0-rc3/bin',
88-
'Linux': "/usr/share/cmake-4.0.0-rc3/bin"}
86+
"path": {'Windows': 'C:/tools/cmake/3.27.9/cmake-3.27.9-windows-x86_64/bin',
87+
'Darwin': '/Users/runner/Applications/CMake/3.27.9/bin',
88+
'Linux': "/usr/share/cmake-3.27.9/bin"}
8989
},
9090
"4.0.0-rc3": {
9191
"path": {'Windows': 'C:/tools/cmake/4.0.0-rc3/cmake-4.0.0-rc3-windows-x86_64/bin',

test/functional/toolchains/cmake/test_cmake_toolchain.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ def test_cmake_toolchain_runtime_types():
495495
assert "LIBCMTD" in client.out
496496

497497

498+
@pytest.mark.tool("cmake", "3.15")
498499
@pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
499500
def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
500501
client = TestClient(path_with_spaces=False)
@@ -503,7 +504,7 @@ def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
503504
client.run("new cmake_lib -d name=hello -d version=0.1")
504505
cmake = client.load("CMakeLists.txt")
505506
cmake2 = cmake.replace('cmake_minimum_required(VERSION 3.15)',
506-
'cmake_minimum_required(VERSION 3.15)')
507+
'cmake_minimum_required(VERSION 3.1)')
507508
assert cmake != cmake2
508509
client.save({"CMakeLists.txt": cmake2})
509510

0 commit comments

Comments
 (0)