diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-05-06 10:58:25 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-05-10 07:56:59 -0400 |
| commit | 65ea833d58f5e4720b89e6f97b38cd7d61b48418 (patch) | |
| tree | 78e555fa67e5d3585a5f6e6052634fcd32a7ceae /test cases/cmake | |
| parent | 7650f328284f24c2f70dcfb1689ae8fc22c04cf1 (diff) | |
| download | meson-65ea833d58f5e4720b89e6f97b38cd7d61b48418.tar.gz | |
Require CMake 3.14 for all tests that use the cmake module
Older versions are not supported by the cmake module since 0.62.
This avoids having to hard-code the linux-bionic-gcc CI job as being
unable to run these tests, which leaves other older environments like
Debian 10 still trying to run them (and failing).
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'test cases/cmake')
| -rw-r--r-- | test cases/cmake/11 cmake_module_path/test.json | 5 | ||||
| -rw-r--r-- | test cases/cmake/19 advanced options/test.json | 5 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/test.json | 5 | ||||
| -rw-r--r-- | test cases/cmake/3 advanced no dep/test.json | 5 |
4 files changed, 3 insertions, 17 deletions
diff --git a/test cases/cmake/11 cmake_module_path/test.json b/test cases/cmake/11 cmake_module_path/test.json deleted file mode 100644 index 79a2b60d3..000000000 --- a/test cases/cmake/11 cmake_module_path/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "tools": { - "cmake": ">=3.12" - } -} diff --git a/test cases/cmake/19 advanced options/test.json b/test cases/cmake/19 advanced options/test.json index 71ea812c7..29888eae2 100644 --- a/test cases/cmake/19 advanced options/test.json +++ b/test cases/cmake/19 advanced options/test.json @@ -1,8 +1,5 @@ { "installed": [ {"type": "exe", "file": "usr/bin/testEXE"} - ], - "tools": { - "cmake": ">=3.11" - } + ] } diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json index 71ea812c7..29888eae2 100644 --- a/test cases/cmake/2 advanced/test.json +++ b/test cases/cmake/2 advanced/test.json @@ -1,8 +1,5 @@ { "installed": [ {"type": "exe", "file": "usr/bin/testEXE"} - ], - "tools": { - "cmake": ">=3.11" - } + ] } diff --git a/test cases/cmake/3 advanced no dep/test.json b/test cases/cmake/3 advanced no dep/test.json index c27ed82e4..e75e54a7e 100644 --- a/test cases/cmake/3 advanced no dep/test.json +++ b/test cases/cmake/3 advanced no dep/test.json @@ -4,8 +4,5 @@ {"type": "exe", "file": "usr/bin/cm_meson_testEXE"}, {"type": "pdb", "file": "usr/bin/cm_benchmark"}, {"type": "exe", "file": "usr/bin/cm_benchmark"} - ], - "tools": { - "cmake": ">=3.11" - } + ] } |