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 <[email protected]>

1 files changed, 13 insertions, 17 deletions

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_@[email protected]'.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_@[email protected]'.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