meson: tests: add openvz 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 e61a95754556e818643dae600071846a9ae81d19..901e71456e08706de1dcfdb3b28efd2381997cf7 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_OPENVZ
-test_programs += openvzutilstest
-endif WITH_OPENVZ
-
 if WITH_VBOX
 test_programs += vboxsnapshotxmltest
 endif WITH_VBOX
@@ -280,14 +276,6 @@ qemuvhostusertest_SOURCES = \
 qemuvhostusertest_LDADD = $(qemu_LDADDS)
 endif WITH_QEMU
 
-if WITH_OPENVZ
-openvzutilstest_SOURCES = \
-       openvzutilstest.c \
-       testutils.c testutils.h
-openvzutilstest_LDADD = $(LDADDS) \
-       ../src/libvirt_driver_openvz.la
-endif WITH_OPENVZ
-
 if WITH_VBOX
 vboxsnapshotxmltest_SOURCES = \
        vboxsnapshotxmltest.c \

diff --git a/tests/meson.build b/tests/meson.build
index a287ce064279fe37b2b504516e1d2e2ddfe1c095..4e3d604b7ccd34fbec769b2fd9a19979b9b59c1a 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -434,6 +434,12 @@ if conf.has('WITH_NWFILTER')
   ]
 endif
 
+if conf.has('WITH_OPENVZ')
+  tests += [
+    { 'name': 'openvzutilstest', 'link_with': [ openvz_lib ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0@.c'.format(data['name'])
   test_bin = executable(