meson: convert vhost-user-bridge

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-10-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tests/Makefile.include b/tests/Makefile.include
index b68911833f9f28c1d02cbf27eb800d865a8ab610..04ffda66a50a52ed09e745b1b511ecbd0737f5cd 100644 (file)
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -65,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF)
        rm $(INITRD_WORK_DIR)/init
        rmdir $(INITRD_WORK_DIR)
 
-tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
-
 SPEED = quick
 
 # gtester tests, possibly with verbose output

diff --git a/tests/meson.build b/tests/meson.build
index 34a5054514a1a0ab12b396c058a059c970b9b9b3..f35dc85ca28b872f4cecd2527223abbbbde95906 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -216,6 +216,15 @@ foreach test_name, extra: tests
        suite: ['unit'])
 endforeach
 
+
+if have_tools and 'CONFIG_VHOST_USER' in config_host
+  executable('vhost-user-bridge',
+             sources: files('vhost-user-bridge.c'),
+             link_with: [libvhost_user],
+             dependencies: [qemuutil],
+             build_by_default: false)
+endif
+
 if have_system and 'CONFIG_POSIX' in config_host
   subdir('qemu-iotests')
 endif