diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-08-09 22:29:13 +0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-08-22 14:18:53 +0000 |
| commit | 0f9b662f9a7a46bcc8f58b521eb5e3bb29b3845e (patch) | |
| tree | 7aa889791af04316704d56e04cacd2c7d4145138 | |
| parent | 201a62cbbae2c39a8b27c7a7b46cecac0011db68 (diff) | |
| download | mesa-0f9b662f9a7a46bcc8f58b521eb5e3bb29b3845e.tar.gz | |
meson: add enable-glcpp-tests option
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>
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | meson_options.txt | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/glcpp/meson.build | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/meson.build b/meson.build index ca80357172e..d50a1bc526a 100644 --- a/meson.build +++ b/meson.build @@ -63,6 +63,7 @@ cpp_args = [] with_moltenvk_dir = get_option('moltenvk-dir') 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') diff --git a/meson_options.txt b/meson_options.txt index b8f753e2e1a..99c75b8aec1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -388,6 +388,12 @@ option( 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', value : false, diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index cdf141b2bc0..0ed18117c70 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -86,7 +86,7 @@ glcpp = executable( # # FIXME: these fail on windows due to whitespace differences 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'] foreach m : modes |