[libvirt PATCH 305/351] meson: tests: add vbox specific tests

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:59:01 UTC 2020


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 b696d3434fe..ab45bdd6da4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,10 +20,6 @@ if WITH_QEMU
 test_helpers += qemucapsprobe
 endif WITH_QEMU
 
-if WITH_VBOX
-test_programs += vboxsnapshotxmltest
-endif WITH_VBOX
-
 if WITH_VMX
 test_programs += vmx2xmltest xml2vmxtest
 endif WITH_VMX
@@ -105,14 +101,6 @@ qemucapsprobe_LDADD = \
 	libqemutestdriver.la $(LDADDS)
 endif ! WITH_QEMU
 
-if WITH_VBOX
-vboxsnapshotxmltest_SOURCES = \
-	vboxsnapshotxmltest.c \
-	testutils.c testutils.h
-vbox_LDADDS = ../src/libvirt_driver_vbox_impl.la
-vboxsnapshotxmltest_LDADD = $(LDADDS) $(vbox_LDADDS)
-endif ! WITH_VBOX
-
 if WITH_VMX
 vmx2xmltest_SOURCES = \
 	vmx2xmltest.c \
diff --git a/tests/meson.build b/tests/meson.build
index e9a6cd72cc7..7f93d816b44 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -509,6 +509,12 @@ if conf.has('WITH_STORAGE_SHEEPDOG')
   ]
 endif
 
+if conf.has('WITH_VBOX')
+  tests += [
+    { 'name': 'vboxsnapshotxmltest', 'link_with': [ vbox_driver_impl ] },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0 at .c'.format(data['name'])
   test_bin = executable(
-- 
2.26.2




More information about the libvir-list mailing list