meson: tests: add node device specific tests

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8e66a946745e0762df6e5ee3f409a4d933327f6d..ae1e97f02d31ad1728b471e48d57e931f424ae28 100644 (file)
--- 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 \
@@ -388,16 +384,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 46bf2b86761b6ac2b477416a7512449b6be1bcdf..7ac481dd8c757faf253bb2f83acb60fadb328f21 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -404,6 +404,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@.c'.format(data['name'])
   test_bin = executable(