From 9b7b63206783cb170f37a1d79427d0fa33ff07fc Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 11:39:29 +0200 Subject: [PATCH] meson: tests: add vbox specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 e2965b0697..bf2c2741ed 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 @@ -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 index b41ddcab10..4eef28b20a 100644 --- 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 = '@0@.c'.format(data['name']) test_bin = executable(