From: Pavel Hrdina Date: Tue, 2 Jun 2020 16:42:07 +0000 (+0200) Subject: meson: tests: add nwfilter specific tests X-Git-Tag: v6.7.0-rc1~306 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517672cedc46cdaeabbcd8a75fedd999fa9f7413;p=thirdparty%2Flibvirt.git meson: tests: add nwfilter specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- diff --git a/tests/Makefile.am b/tests/Makefile.am index 5809f7d20f..e61a957545 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 @@ -330,19 +325,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 b8cf6911f6..a287ce0642 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -427,6 +427,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@.c'.format(data['name']) test_bin = executable(