Mesa (master): Revert "meson: add enable-glcpp-tests option"

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: d8911a0ae850c8c69c4b28d0f3709538128aba65
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8911a0ae850c8c69c4b28d0f3709538128aba65

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Thu Mar 11 18:23:56 2021 +0100

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

This reverts commit f9ae947e7272897bc31b0ec9dca3be0d7ab33119.

Not needed anymore.

Reviewed-by: Dylan Baker <dylan.c.baker at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9528>

---

 meson.build                         | 1 -
 meson_options.txt                   | 6 ------
 src/compiler/glsl/glcpp/meson.build | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 4ba0bd1217d..5346c74424d 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
index 65f6665bfe2..3d37a2b2c15 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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',
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index e02de181259..a3ab34d3377 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' 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