Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tests/Makefile.am | 25 -------------------------
tests/meson.build | 8 ++++++++
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c3d77d16a07..a436f9e0645 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,10 +95,6 @@ if WITH_VMWARE
test_programs += vmwarevertest
endif WITH_VMWARE
-if WITH_BHYVE
-test_programs += bhyvexml2argvtest bhyvexml2xmltest bhyveargv2xmltest
-endif WITH_BHYVE
-
if WITH_YAJL
test_programs += virjsontest
endif WITH_YAJL
@@ -425,27 +421,6 @@ vmwarevertest_SOURCES = \
vmwarevertest_LDADD = $(LDADDS)
endif ! WITH_VMWARE
-if WITH_BHYVE
-bhyve_LDADDS = \
- ../src/libvirt_driver_bhyve_impl.la \
- $(LDADDS) \
- $(NULL)
-bhyvexml2argvtest_SOURCES = \
- bhyvexml2argvtest.c \
- testutils.c testutils.h
-bhyvexml2argvtest_LDADD = $(bhyve_LDADDS)
-
-bhyvexml2xmltest_SOURCES = \
- bhyvexml2xmltest.c \
- testutils.c testutils.h
-bhyvexml2xmltest_LDADD = $(bhyve_LDADDS)
-
-bhyveargv2xmltest_SOURCES = \
- bhyveargv2xmltest.c \
- testutils.c testutils.h
-bhyveargv2xmltest_LDADD = $(bhyve_LDADDS)
-endif ! WITH_BHYVE
-
if WITH_NETWORK
networkxml2xmltest_SOURCES = \
networkxml2xmltest.c \
diff --git a/tests/meson.build b/tests/meson.build
index ed0731ecc42..fe4d252c640 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -335,6 +335,14 @@ if host_machine.system() == 'linux'
]
endif
+if conf.has('WITH_BHYVE')
+ tests += [
+ { 'name': 'bhyveargv2xmltest', 'link_with': [ bhyve_driver_impl ] },
+ { 'name': 'bhyvexml2argvtest', 'link_with': [ bhyve_driver_impl ] },
+ { 'name': 'bhyvexml2xmltest', 'link_with': [ bhyve_driver_impl ] },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
