build: add test-gl-renderer option
This shall be used by CI due to https://gitlab.freedesktop.org/mesa/mesa/issues/2219 It defaults to true, meaning that people by default will be running the GL-renderer tests. It works fine on hardware drivers, just not llvmpipe. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
committed by
Pekka Paalanen
parent
007ab1e5a4
commit
1618697dc3
@@ -115,6 +115,8 @@ config_h.set_quoted('LIBEXECDIR', dir_libexec)
|
|||||||
config_h.set_quoted('MODULEDIR', dir_module_weston)
|
config_h.set_quoted('MODULEDIR', dir_module_weston)
|
||||||
config_h.set_quoted('LIBWESTON_MODULEDIR', dir_module_libweston)
|
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')
|
backend_default = get_option('backend-default')
|
||||||
if backend_default == 'auto'
|
if backend_default == 'auto'
|
||||||
foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
|
foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
|
||||||
|
|||||||
@@ -204,6 +204,12 @@ option(
|
|||||||
value: true,
|
value: true,
|
||||||
description: 'Tests: output JUnit XML results'
|
description: 'Tests: output JUnit XML results'
|
||||||
)
|
)
|
||||||
|
option(
|
||||||
|
'test-gl-renderer',
|
||||||
|
type: 'boolean',
|
||||||
|
value: true,
|
||||||
|
description: 'Tests: allow running with GL-renderer'
|
||||||
|
)
|
||||||
option(
|
option(
|
||||||
'doc',
|
'doc',
|
||||||
type: 'boolean',
|
type: 'boolean',
|
||||||
|
|||||||
@@ -229,6 +229,13 @@ execute_compositor(const struct compositor_setup *setup,
|
|||||||
}
|
}
|
||||||
#endif
|
#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);
|
prog_args_init(&args);
|
||||||
|
|
||||||
/* argv[0] */
|
/* argv[0] */
|
||||||
|
|||||||
Reference in New Issue
Block a user