diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-15 17:19:42 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-15 23:43:10 -0400 |
| commit | 2a8bb3b9f10f180c50930db92eaf23e8c4c9b81a (patch) | |
| tree | 250e3df2741601cf169f85728a11841d1d296e54 /test cases/cmake | |
| parent | 2fd7d64a50aa4f8a76d5b9ca13f7d8f8f40b959c (diff) | |
| download | meson-2a8bb3b9f10f180c50930db92eaf23e8c4c9b81a.tar.gz | |
tests: short-circuit tests that require cmake, faster
We have two ways of marking a test as skipped:
- raise MESON_SKIP_TEST
- declare that the tools it needs in test.json are unavailable
Doing the former requires performing the configure stage including e.g.
language setup.
In several cases we weren't even getting this far anyway since we used
both mechanisms (the cmake category has a category-wide skip for this,
in fact). In some case, we were missing test.json declaring it skippable;
add this.
Diffstat (limited to 'test cases/cmake')
| -rw-r--r-- | test cases/cmake/11 cmake_module_path/meson.build | 4 | ||||
| -rw-r--r-- | test cases/cmake/22 cmake module/meson.build | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/test cases/cmake/11 cmake_module_path/meson.build b/test cases/cmake/11 cmake_module_path/meson.build index e20193696..2e835fba1 100644 --- a/test cases/cmake/11 cmake_module_path/meson.build +++ b/test cases/cmake/11 cmake_module_path/meson.build @@ -3,10 +3,6 @@ project('user CMake find_package module using cmake_module_path', ['c', 'cpp'], meson_version: '>= 0.55.0') -if not find_program('cmake', required: false).found() - error('MESON_SKIP_TEST cmake binary not available.') -endif - # NOTE: can't request Python3 via dependency('Python3', method: 'cmake') # Meson intercepts and wants "method: auto" diff --git a/test cases/cmake/22 cmake module/meson.build b/test cases/cmake/22 cmake module/meson.build index 68f9993a6..581804f66 100644 --- a/test cases/cmake/22 cmake module/meson.build +++ b/test cases/cmake/22 cmake module/meson.build @@ -4,11 +4,6 @@ if build_machine.system() == 'cygwin' error('MESON_SKIP_TEST CMake is broken on Cygwin.') endif -cmake_bin = find_program('cmake', required: false) -if not cmake_bin.found() - error('MESON_SKIP_TEST CMake not installed.') -endif - cc = meson.get_compiler('c') if cc.get_id() == 'clang-cl' and meson.backend() == 'ninja' and build_machine.system() == 'windows' error('MESON_SKIP_TEST CMake installation nor operational for vs2017 clangclx64ninja') |