Revert "meson: add enable-glcpp-tests option"

This reverts commit f9ae947e72.

Not needed anymore.

Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>
This commit is contained in:
Michel Dänzer 2021-03-11 18:23:56 +01:00 committed by Marge Bot
parent fc0d1aab50
commit d8911a0ae8
3 changed files with 1 additions and 8 deletions

View File

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

@ -354,12 +354,6 @@ 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' and with_glcpp_tests
if with_any_opengl and with_tests and host_machine.system() != 'windows'
modes = ['unix', 'windows', 'oldmac', 'bizarro']
# For some unfathomable reason, three out of these four tests often time out