meson: tests: add vbox 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 · 9b7b632 · 9b7b632
1 parent 4049917
commit 9b7b632
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -101,14 +97,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
@@ -519,6 +519,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 = '@[email protected]'.format(data['name'])
   test_bin = executable(