meson: tests: add lxc specific tests

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02ef2ec84b565c3d5da9c9ca317dbf8eaca9249f..00d5f6a9e9484e7cd55e09c68b7a41ca7fb475e0 100644 (file)
--- 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
index ccc9fe01a7435f9506e5e66f695cd6512860c483..19e014801e905fc986d0eef0b75381d0020b1264 100644 (file)
--- 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 = '@0@.c'.format(data['name'])
   test_bin = executable(