meson: tests: add lxc specific tests

Signed-off-by: Pavel Hrdina <[email protected]> Reviewed-by: Peter Krempa <[email protected]> Reviewed-by: Neal Gompa <[email protected]>
cloud-hypervisor · Aug 3, 2020 · 8cd9aca · 8cd9aca
1 parent 7b16f6d
commit 8cd9aca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -53,10 +53,6 @@ test_programs += qemuxml2argvtest qemuxml2xmltest \
 test_helpers += qemucapsprobe
 endif WITH_QEMU
 
-if WITH_LXC
-test_programs += lxcxml2xmltest lxcconf2xmltest
-endif WITH_LXC
-
 if WITH_OPENVZ
 test_programs += openvzutilstest
 endif WITH_OPENVZ
@@ -302,24 +298,6 @@ qemuvhostusertest_SOURCES = \
 qemuvhostusertest_LDADD = $(qemu_LDADDS)
 endif WITH_QEMU
 
-if WITH_LXC
-
-lxc_LDADDS = \
-	../src/libvirt_driver_lxc_impl.la \
-	$(LDADDS) \
-	$(NULL)
-
-lxcxml2xmltest_SOURCES = \
-	lxcxml2xmltest.c testutilslxc.c testutilslxc.h \
-	testutils.c testutils.h
-lxcxml2xmltest_LDADD = $(lxc_LDADDS)
-
-lxcconf2xmltest_SOURCES = \
-	lxcconf2xmltest.c testutilslxc.c testutilslxc.h \
-	testutils.c testutils.h
-lxcconf2xmltest_LDADD = $(lxc_LDADDS)
-endif WITH_LXC
-
 if WITH_OPENVZ
 openvzutilstest_SOURCES = \
 	openvzutilstest.c \

diff --git a/tests/meson.build b/tests/meson.build
@@ -389,6 +389,13 @@ if conf.has('WITH_LIBXL')
   ]
 endif
 
+if conf.has('WITH_LXC')
+  tests += [
+    { 'name': 'lxcconf2xmltest', 'link_with': [ lxc_driver_impl_lib ], 'link_whole': [ test_utils_lxc_lib ] },
+    { 'name': 'lxcxml2xmltest', 'link_with': [ lxc_driver_impl_lib ], 'link_whole': [ test_utils_lxc_lib ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@[email protected]'.format(data['name'])
   test_bin = executable(