From bdc5c8793a13abb8846d115b7923df87605d05bd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 1 Jun 2023 10:12:50 -0300 Subject: meson: allow disabling tests The new meson build system support diverges from former build system where the tests were not built until required. This has caused an issue in NixOS[1] due to broken build of tests in Darwin platform, so this patch allows the control if tests should be build or not. 1. https://github.com/NixOS/nixpkgs/pull/235210 Signed-off-by: Otavio Salvador Signed-off-by: David Gibson --- meson.build | 6 +++--- meson_options.txt | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 4654803..bf70f29 100644 --- a/meson.build +++ b/meson.build @@ -134,8 +134,8 @@ if not meson.is_cross_build() if py.found() and swig.found() subdir('pylibfdt') endif +endif - if get_option('tools') - subdir('tests') - endif +if get_option('tests') + subdir('tests') endif diff --git a/meson_options.txt b/meson_options.txt index 82621c3..36f391a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,5 @@ option('python', type: 'feature', value: 'auto', description: 'Build pylibfdt Python library') option('static-build', type: 'boolean', value: false, description: 'Build static binaries') +option('tests', type: 'boolean', value: true, + description: 'Build tests') -- cgit v1.1