meson: Move xvmc test tools from unit tests to installed tools.
These are not unit tests, as they rely on the host's XVMC and some user
configuration. Switch them over to being general installed tools, to fix
unit testing.
Fixes: 22a817af8a
("meson: build gallium xvmc state tracker")
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
parent
695a4cb0f6
commit
162fcdad6a
|
@ -58,7 +58,7 @@ with_osmesa = get_option('osmesa')
|
|||
with_swr_arches = get_option('swr-arches')
|
||||
with_tools = get_option('tools')
|
||||
if with_tools.contains('all')
|
||||
with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau']
|
||||
with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
|
||||
endif
|
||||
|
||||
dri_drivers_path = get_option('dri-drivers-path')
|
||||
|
|
|
@ -295,7 +295,7 @@ option(
|
|||
'tools',
|
||||
type : 'array',
|
||||
value : [],
|
||||
choices : ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'all'],
|
||||
choices : ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc', 'all'],
|
||||
description : 'List of tools to build.',
|
||||
)
|
||||
option(
|
||||
|
|
|
@ -27,31 +27,27 @@ libxvmc_st = static_library(
|
|||
)
|
||||
|
||||
# These tests will not work without a working xvmc configuration.
|
||||
if with_tests
|
||||
if with_tools.contains('xvmc')
|
||||
dep_xvmcw = cc.find_library('XvMCW')
|
||||
dep_real_xvmc = dependency('xvmc')
|
||||
foreach x : ['context', 'surface', 'subpicture', 'blocks', 'rendering']
|
||||
_name = 'xvmc_@0@'.format(x)
|
||||
test(
|
||||
_name,
|
||||
executable(
|
||||
_name,
|
||||
files('tests/test_@0@.c'.format(x), 'tests/testlib.c'),
|
||||
dependencies : [
|
||||
dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
|
||||
],
|
||||
)
|
||||
)
|
||||
endforeach
|
||||
|
||||
test(
|
||||
'xvmc_bench',
|
||||
executable(
|
||||
'xvmc_bench',
|
||||
files('tests/xvmc_bench.c', 'tests/testlib.c'),
|
||||
_name,
|
||||
files('tests/test_@0@.c'.format(x), 'tests/testlib.c'),
|
||||
dependencies : [
|
||||
dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
|
||||
],
|
||||
install: true,
|
||||
)
|
||||
endforeach
|
||||
|
||||
executable(
|
||||
'xvmc_bench',
|
||||
files('tests/xvmc_bench.c', 'tests/testlib.c'),
|
||||
dependencies : [
|
||||
dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
|
||||
],
|
||||
install: true,
|
||||
)
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue