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>

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')

meson_options.txt

@@ -387,6 +387,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',

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