From 162fcdad6a9db9819f4c18d6f5f4083e50edc00a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 12 Jul 2018 11:41:37 -0700 Subject: 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: 22a817af8a89 ("meson: build gallium xvmc state tracker") Reviewed-by: Dylan Baker --- src/gallium/state_trackers/xvmc/meson.build | 30 +++++++++++++---------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build index 2c98b0290d9..d120d533eef 100644 --- a/src/gallium/state_trackers/xvmc/meson.build +++ b/src/gallium/state_trackers/xvmc/meson.build @@ -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 -- cgit v1.2.3