From 9b31c026e0bca5562415f263c59858b6fdd084b0 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Wed, 24 Jun 2020 12:28:17 +0200 Subject: [PATCH] meson: tests: add node device specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 8e66a94674..ae1e97f02d 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 \ @@ -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 46bf2b8676..7ac481dd8c 100644 --- 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(