[libvirt PATCH 298/351] meson: tests: add openvz specific tests

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tests/Makefile.am | 12 ------------
 tests/meson.build |  6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6a217cd92e7..9e436512fef 100644
--- 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
@@ -284,14 +280,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 916b6de10f9..6dd926e96b8 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -424,6 +424,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 at .c'.format(data['name'])
   test_bin = executable(
-- 
2.26.2