From fca5e4695723316fcccd0b448c6bb025ea333ece Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 11:39:54 +0200 Subject: [PATCH] meson: tests: add vmx specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- tests/Makefile.am | 16 ---------------- tests/meson.build | 7 +++++++ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 406730e3fa..86e8c37583 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,10 +20,6 @@ if WITH_QEMU test_helpers += qemucapsprobe endif WITH_QEMU -if WITH_VMX -test_programs += vmx2xmltest xml2vmxtest -endif WITH_VMX - if WITH_YAJL test_programs += virjsontest endif WITH_YAJL @@ -93,18 +89,6 @@ qemucapsprobe_LDADD = \ libqemutestdriver.la $(LDADDS) endif WITH_QEMU -if WITH_VMX -vmx2xmltest_SOURCES = \ - vmx2xmltest.c \ - testutils.c testutils.h -vmx2xmltest_LDADD = $(LDADDS) - -xml2vmxtest_SOURCES = \ - xml2vmxtest.c \ - testutils.c testutils.h -xml2vmxtest_LDADD = $(LDADDS) -endif WITH_VMX - if WITH_NSS ## Intentionaly not linking with anything else. ## See the test source for more detailed explanation. diff --git a/tests/meson.build b/tests/meson.build index 235d07847b..6f4fe84e28 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -531,6 +531,13 @@ if conf.has('WITH_VMWARE') ] endif +if conf.has('WITH_VMX') + tests += [ + { 'name': 'vmx2xmltest' }, + { 'name': 'xml2vmxtest' }, + ] +endif + foreach data : tests test_sources = '@0@.c'.format(data['name']) test_bin = executable(