From 2a8bb3b9f10f180c50930db92eaf23e8c4c9b81a Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 15 Jul 2024 17:19:42 -0400 Subject: 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. --- test cases/linuxlike/13 cmake dependency/meson.build | 5 +---- test cases/linuxlike/13 cmake dependency/test.json | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test cases/linuxlike') diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index f612e1d52..812dcf9c5 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -2,10 +2,7 @@ # due to use of setup_env.json project('external CMake dependency', ['c', 'cpp']) -cmake = find_program('cmake', required: false) -if not cmake.found() - error('MESON_SKIP_TEST cmake binary not available.') -endif +cmake = find_program('cmake') # Zlib is probably on all dev machines. diff --git a/test cases/linuxlike/13 cmake dependency/test.json b/test cases/linuxlike/13 cmake dependency/test.json index 484ce202c..208b59193 100644 --- a/test cases/linuxlike/13 cmake dependency/test.json +++ b/test cases/linuxlike/13 cmake dependency/test.json @@ -10,5 +10,8 @@ { "line": " ['CMMesonTESTf1::evil_non_standard_target']" } - ] + ], + "tools": { + "cmake": ">=3.11" + } } -- cgit v1.2.3