meson: add enable-glcpp-tests option

these are too intermittent to be left enabled on CI for now

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8738>
This commit is contained in:
Mike Blumenkrantz 2021-01-27 09:03:45 -05:00 committed by Marge Bot
parent 6a29632dd2
commit f9ae947e72
3 changed files with 8 additions and 1 deletions

View File

@ -51,6 +51,7 @@ pre_args = [
with_vulkan_icd_dir = get_option('vulkan-icd-dir')
with_tests = get_option('build-tests')
with_glcpp_tests = get_option('enable-glcpp-tests')
with_aco_tests = get_option('build-aco-tests')
with_glx_read_only_text = get_option('glx-read-only-text')
with_glx_direct = get_option('glx-direct')

View File

@ -348,6 +348,12 @@ option(
value : false,
description : 'Build unit tests. Currently this will build *all* unit tests except the ACO tests, which may build more than expected.'
)
option(
'enable-glcpp-tests',
type : 'boolean',
value : true,
description : 'Build glcpp unit tests. These are flaky on CI.'
)
option(
'build-aco-tests',
type : 'boolean',

View File

@ -80,7 +80,7 @@ glcpp = executable(
)
# FIXME: these fail on windows due to whitespace differences
if with_any_opengl and with_tests and host_machine.system() != 'windows'
if with_any_opengl and with_tests and host_machine.system() != 'windows' and with_glcpp_tests
modes = ['unix', 'windows', 'oldmac', 'bizarro']
if dep_valgrind.found()
modes += ['valgrind']