[libvirt PATCH 297/351] meson: tests: add nwfilter specific tests

[Pavel Hrdina]

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 816d7ec8a64..6a217cd92e7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -77,11 +77,6 @@ if WITH_STORAGE_SHEEPDOG
 test_programs += storagebackendsheepdogtest
 endif WITH_STORAGE_SHEEPDOG
 
-if WITH_NWFILTER
-test_programs += nwfilterebiptablestest
-test_programs += nwfilterxml2firewalltest
-endif WITH_NWFILTER
-
 if WITH_STORAGE
 test_programs += storagevolxml2argvtest
 test_programs += storagepoolxml2argvtest
@@ -334,19 +329,6 @@ storagebackendsheepdogtest_LDADD = \
 	$(LDADDS)
 endif ! WITH_STORAGE_SHEEPDOG
 
-if WITH_NWFILTER
-nwfilterebiptablestest_SOURCES = \
-	nwfilterebiptablestest.c \
-	testutils.c testutils.h
-nwfilterebiptablestest_LDADD = ../src/libvirt_driver_nwfilter_impl.la $(LDADDS)
-
-nwfilterxml2firewalltest_SOURCES = \
-	nwfilterxml2firewalltest.c \
-	testutils.c testutils.h
-nwfilterxml2firewalltest_LDADD = \
-	../src/libvirt_driver_nwfilter_impl.la $(LDADDS)
-endif WITH_NWFILTER
-
 if WITH_STORAGE
 virstorageutiltest_SOURCES = \
 	virstorageutiltest.c \
diff --git a/tests/meson.build b/tests/meson.build
index 0b503bca720..916b6de10f9 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -417,6 +417,13 @@ if conf.has('WITH_NSS')
   ]
 endif
 
+if conf.has('WITH_NWFILTER')
+  tests += [
+    { 'name': 'nwfilterebiptablestest', 'link_with': [ nwfilter_driver_impl ] },
+    { 'name': 'nwfilterxml2firewalltest', 'link_with': [ nwfilter_driver_impl ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0 at .c'.format(data['name'])
   test_bin = executable(
-- 
2.26.2