diff options
| author | Pavel Hrdina <phrdina@redhat.com> | 2020-07-27 11:37:34 +0200 |
|---|---|---|
| committer | Pavel Hrdina <phrdina@redhat.com> | 2020-08-03 09:27:05 +0200 |
| commit | 6a452eadc2351ccd2a96afbd7219e6eafab5e639 (patch) | |
| tree | 10dff99390916ea78de1e9f318c404f424734837 | |
| parent | 8cd9aca98b7ade1470daa59bc9de482bc3ecfaf1 (diff) | |
| download | libvirt-6a452eadc2351ccd2a96afbd7219e6eafab5e639.tar.gz | |
meson: tests: add network specific tests
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
| -rw-r--r-- | tests/Makefile.am | 25 | ||||
| -rw-r--r-- | tests/meson.build | 8 |
2 files changed, 8 insertions, 25 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 00d5f6a9e9..8e66a94674 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,14 +73,6 @@ if WITH_YAJL test_programs += virjsontest endif WITH_YAJL -if WITH_NETWORK -test_programs += \ - networkxml2xmltest \ - networkxml2conftest \ - networkxml2firewalltest \ - $(NULL) -endif WITH_NETWORK - if WITH_STORAGE_SHEEPDOG test_programs += storagebackendsheepdogtest endif WITH_STORAGE_SHEEPDOG @@ -333,23 +325,6 @@ vmwarevertest_SOURCES = \ vmwarevertest_LDADD = $(LDADDS) endif WITH_VMWARE -if WITH_NETWORK -networkxml2xmltest_SOURCES = \ - networkxml2xmltest.c \ - testutils.c testutils.h -networkxml2xmltest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) - -networkxml2conftest_SOURCES = \ - networkxml2conftest.c \ - testutils.c testutils.h -networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) - -networkxml2firewalltest_SOURCES = \ - networkxml2firewalltest.c \ - testutils.c testutils.h -networkxml2firewalltest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) -endif WITH_NETWORK - if WITH_STORAGE_SHEEPDOG storagebackendsheepdogtest_SOURCES = \ storagebackendsheepdogtest.c \ diff --git a/tests/meson.build b/tests/meson.build index 19e014801e..46bf2b8676 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -396,6 +396,14 @@ if conf.has('WITH_LXC') ] endif +if conf.has('WITH_NETWORK') + tests += [ + { 'name': 'networkxml2conftest', 'link_with': [ network_driver_impl ] }, + { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_impl ] }, + { 'name': 'networkxml2xmltest', 'link_with': [ network_driver_impl ] }, + ] +endif + foreach data : tests test_sources = '@0@.c'.format(data['name']) test_bin = executable( |