Mesa (master): meson: add enable-glcpp-tests option
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 28 16:12:21 UTC 2021
Module: Mesa
Branch: master
Commit: f9ae947e7272897bc31b0ec9dca3be0d7ab33119
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9ae947e7272897bc31b0ec9dca3be0d7ab33119
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Wed Jan 27 09:03:45 2021 -0500
meson: add enable-glcpp-tests option
these are too intermittent to be left enabled on CI for now
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8738>
---
meson.build | 1 +
meson_options.txt | 6 ++++++
src/compiler/glsl/glcpp/meson.build | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 96571c9df25..827651f088f 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
index fc73f6e1c24..599a2b3fd89 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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',
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index a7dce6d9a3d..84ba0684a2c 100644
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -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']
More information about the mesa-commit
mailing list