Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tests/Makefile.am | 29 -----------------------------
tests/meson.build | 9 +++++++++
2 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 55369717cd9..a927c0cb2fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,10 +27,6 @@ test_programs += \
$(NULL)
endif WITH_REMOTE
-if WITH_LIBVIRTD
-test_programs += fdstreamtest
-endif WITH_LIBVIRTD
-
if WITH_SECDRIVER_SELINUX
if WITH_ATTR
test_programs += securityselinuxtest \
@@ -148,11 +144,6 @@ libvirtd_test_scripts = \
if WITH_LIBVIRTD
test_scripts += $(libvirtd_test_scripts)
-
-test_programs += \
- eventtest \
- virdrivermoduletest \
- virdriverconnvalidatetest
endif ! WITH_LIBVIRTD
if WITH_SECDRIVER_APPARMOR
@@ -614,23 +605,3 @@ endif WITH_SECDRIVER_SELINUX
virjsontest_SOURCES = \
virjsontest.c testutils.h testutils.c
virjsontest_LDADD = $(LDADDS)
-
-if WITH_LIBVIRTD
-virdrivermoduletest_SOURCES = \
- virdrivermoduletest.c testutils.h testutils.c
-virdrivermoduletest_LDADD = $(LDADDS)
-
-virdriverconnvalidatetest_SOURCES = \
- virdriverconnvalidatetest.c testutils.h testutils.c
-virdriverconnvalidatetest_LDADD = $(LDADDS)
-endif WITH_LIBVIRTD
-
-if WITH_LIBVIRTD
-eventtest_SOURCES = \
- eventtest.c testutils.h testutils.c
-eventtest_LDADD = $(LDADDS)
-endif WITH_LIBVIRTD
-
-fdstreamtest_SOURCES = \
- fdstreamtest.c testutils.h testutils.c
-fdstreamtest_LDADD = $(LDADDS)
diff --git a/tests/meson.build b/tests/meson.build
index 1eded8454f1..cc1b830d72b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -362,6 +362,15 @@ if conf.has('WITH_ESX')
]
endif
+if conf.has('WITH_LIBVIRTD')
+ tests += [
+ { 'name': 'eventtest', 'deps': [ thread_dep ] },
+ { 'name': 'fdstreamtest' },
+ { 'name': 'virdriverconnvalidatetest' },
+ { 'name': 'virdrivermoduletest' },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
