[libvirt PATCH 295/351] meson: tests: add node device specific tests

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:58:51 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tests/Makefile.am | 14 --------------
 tests/meson.build |  6 ++++++
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ad8bc21fd8d..a8a3996bab1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -99,10 +99,6 @@ test_helpers += nsslinktest nssguestlinktest
 test_programs += nsstest nssguesttest
 endif WITH_NSS
 
-if WITH_NODE_DEVICES
-test_programs += nodedevmdevctltest
-endif WITH_NODE_DEVICES
-
 test_scripts =
 libvirtd_test_scripts = \
 	libvirtd-fail \
@@ -392,16 +388,6 @@ storagepoolcapstest_SOURCES = \
 storagepoolcapstest_LDADD = $(LDADDS)
 endif ! WITH_STORAGE
 
-if WITH_NODE_DEVICES
-nodedevmdevctltest_SOURCES = \
-	nodedevmdevctltest.c \
-	testutils.c testutils.h
-
-nodedevmdevctltest_LDADD = \
-	../src/libvirt_driver_nodedev_impl.la \
-	$(LDADDS)
-endif WITH_NODE_DEVICES
-
 virnetmessagetest_SOURCES = \
 	virnetmessagetest.c testutils.h testutils.c
 virnetmessagetest_LDADD = $(LDADDS)
diff --git a/tests/meson.build b/tests/meson.build
index 4fc8c170c0a..e8154810b05 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -394,6 +394,12 @@ if conf.has('WITH_NETWORK')
   ]
 endif
 
+if conf.has('WITH_NODE_DEVICES')
+  tests += [
+    { 'name': 'nodedevmdevctltest', 'link_with': [ node_device_driver_impl ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0 at .c'.format(data['name'])
   test_bin = executable(
-- 
2.26.2




More information about the libvir-list mailing list