OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: add enable-glcpp-tests option

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

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17928>
This commit is contained in:
Yonggang Luo
2022-08-09 22:29:13 +08:00
committed by Marge Bot
parent 201a62cbba
commit 0f9b662f9a
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

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

6
meson_options.txt
View File

@@ -387,6 +387,12 @@ option(
value : false, value : false,
description : 'Build unit tests. Currently this will build *all* unit tests except the ACO tests, which may build more than expected.' 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( option(
'build-aco-tests', 'build-aco-tests',
type : 'boolean', type : 'boolean',

2
src/compiler/glsl/glcpp/meson.build
View File

@@ -86,7 +86,7 @@ glcpp = executable(
# #
# FIXME: these fail on windows due to whitespace differences # FIXME: these fail on windows due to whitespace differences
if with_any_opengl and with_tests and meson.has_exe_wrapper() and \ if with_any_opengl and with_tests and meson.has_exe_wrapper() and \
host_machine.system() != 'windows' host_machine.system() != 'windows' and with_glcpp_tests
modes = ['unix', 'windows', 'oldmac', 'bizarro'] modes = ['unix', 'windows', 'oldmac', 'bizarro']
foreach m : modes foreach m : modes