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 44f02da7af6..ad8bc21fd8d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,14 +73,6 @@ if WITH_YAJL
test_programs += virjsontest
endif WITH_YAJL
-if WITH_NETWORK
-test_programs += \
- networkxml2xmltest \
- networkxml2conftest \
- networkxml2firewalltest \
- $(NULL)
-endif WITH_NETWORK
-
if WITH_STORAGE_SHEEPDOG
test_programs += storagebackendsheepdogtest
endif WITH_STORAGE_SHEEPDOG
@@ -337,23 +329,6 @@ vmwarevertest_SOURCES = \
vmwarevertest_LDADD = $(LDADDS)
endif ! WITH_VMWARE
-if WITH_NETWORK
-networkxml2xmltest_SOURCES = \
- networkxml2xmltest.c \
- testutils.c testutils.h
-networkxml2xmltest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS)
-
-networkxml2conftest_SOURCES = \
- networkxml2conftest.c \
- testutils.c testutils.h
-networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS)
-
-networkxml2firewalltest_SOURCES = \
- networkxml2firewalltest.c \
- testutils.c testutils.h
-networkxml2firewalltest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS)
-endif ! WITH_NETWORK
-
if WITH_STORAGE_SHEEPDOG
storagebackendsheepdogtest_SOURCES = \
storagebackendsheepdogtest.c \
diff --git a/tests/meson.build b/tests/meson.build
index 439d95401ef..4fc8c170c0a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -386,6 +386,14 @@ if conf.has('WITH_LXC')
]
endif
+if conf.has('WITH_NETWORK')
+ tests += [
+ { 'name': 'networkxml2conftest', 'link_with': [ network_driver_impl ] },
+ { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_impl ] },
+ { 'name': 'networkxml2xmltest', 'link_with': [ network_driver_impl ] },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
