From fb7b1a412504d3bcf29e01b0d4b96e3f8badc79c Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 1 Jun 2022 14:52:11 +0300 Subject: [PATCH] Revert "build: add test-gl-renderer option" This reverts commit 1618697dc3db9e63ed601be7cbc2fb5e84c94b41. The original commit was a workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/2219 which was fixed in Mesa: - c7617d8908a970124321ce731b43d5996c3c5775 released as 20.1.0-rc1 - a0e6341fe4417e41cda0b19e4fa7f8bbe4e1dba1 released as 19.3.5 - f27e5d9df5bc9c85d45c2cb1f2a4997b453365fe released as 20.0.0 This workaround should not be necessary anymore, we don't use it in our CI, and it was manual to begin with. Therefore remove it. Signed-off-by: Pekka Paalanen --- meson.build | 2 -- meson_options.txt | 6 ------ tests/weston-test-fixture-compositor.c | 7 ------- 3 files changed, 15 deletions(-) diff --git a/meson.build b/meson.build index 8498ec1f..47324bd8 100644 --- a/meson.build +++ b/meson.build @@ -121,8 +121,6 @@ config_h.set_quoted('LIBEXECDIR', dir_libexec) config_h.set_quoted('MODULEDIR', dir_module_weston) config_h.set_quoted('LIBWESTON_MODULEDIR', dir_module_libweston) -config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer')) - backend_default = get_option('backend-default') if backend_default == 'auto' foreach b : [ 'headless', 'x11', 'wayland', 'drm' ] diff --git a/meson_options.txt b/meson_options.txt index 90ab3832..38c746e9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -210,12 +210,6 @@ option( value: false, description: 'Tests: consider skip to be a failure' ) -option( - 'test-gl-renderer', - type: 'boolean', - value: true, - description: 'Tests: allow running with GL-renderer' -) option( 'doc', type: 'boolean', diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c index 87ff6bf1..420ab8f1 100644 --- a/tests/weston-test-fixture-compositor.c +++ b/tests/weston-test-fixture-compositor.c @@ -329,13 +329,6 @@ execute_compositor(const struct compositor_setup *setup, } #endif -#if !TEST_GL_RENDERER - if (setup->renderer == RENDERER_GL) { - fprintf(stderr, "GL-renderer disabled for tests, skipping.\n"); - return RESULT_SKIP; - } -#endif - prog_args_init(&args); /* argv[0] */