From d3da291eb071ce35f530fda690a300e44b99b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 12 Sep 2018 11:02:58 +0200 Subject: [PATCH] meson: disable "slow tests" too when tests are generally disabled We would have a strange situation where after setting -Dslow-tests=true -Dtests=false we'd get mostly the slow tests (plus some other ones which I'll fix in subsequent commit). Let's simplify things by making -Dtests=false just disable those tests too. --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index a97c5fcffc..28fd4da365 100644 --- a/meson.build +++ b/meson.build @@ -270,7 +270,11 @@ pkgconfig = import('pkgconfig') check_compilation_sh = find_program('tools/meson-check-compilation.sh') meson_build_sh = find_program('tools/meson-build.sh') -if get_option('tests') != 'false' +want_tests = get_option('tests') +slow_tests = want_tests != 'false' and get_option('slow-tests') +install_tests = get_option('install-tests') + +if want_tests != 'false' cxx = find_program('c++', required : false) if cxx.found() # Used only for tests @@ -1291,9 +1295,6 @@ conf.set10('ENABLE_NSS', enable_nss) conf.set10('ENABLE_TIMEDATECTL', get_option('timedated') or get_option('timesyncd')) -want_tests = get_option('tests') -install_tests = get_option('install-tests') -slow_tests = get_option('slow-tests') tests = [] fuzzers = []