Merge tag 'pull-vfio-20240129' of https://github.com/legoater/qemu into staging

[mirror_qemu.git] / tests / meson.build

diff --git a/tests/meson.build b/tests/meson.build
index 8e318ec513aae092f2a3bf073547bb76aa77d2de..0a6f96f8f8427e5049f4bd7fa095dd4ef86758d8 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -68,27 +68,19 @@ test_deps = {
   'test-qht-par': qht_bench,
 }
 
-if have_tools and have_vhost_user and 'CONFIG_LINUX' in config_host
+if have_tools and have_vhost_user and host_os == 'linux'
   executable('vhost-user-bridge',
              sources: files('vhost-user-bridge.c'),
              dependencies: [qemuutil, vhost_user])
 endif
 
-test('decodetree', sh,
-     args: [ files('decode/check.sh'), config_host['PYTHON'], files('../scripts/decodetree.py') ],
-     workdir: meson.current_source_dir() / 'decode',
-     suite: 'decodetree')
+subdir('decode')
 
-if 'CONFIG_TCG' in config_all
+if 'CONFIG_TCG' in config_all_accel
   subdir('fp')
 endif
 
-if get_option('tcg').allowed()
-  if 'CONFIG_PLUGIN' in config_host
-    subdir('plugin')
-  endif
-endif
-
+subdir('plugin')
 subdir('unit')
 subdir('qapi-schema')
 subdir('qtest')