From 13eb365d5da68e62deb4f7906085884ace992cae Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 27 Jul 2020 11:39:41 +0200 Subject: [PATCH] meson: tests: add vmware specific tests Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- tests/Makefile.am | 11 ----------- tests/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index bf2c2741ed..406730e3fa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,10 +24,6 @@ if WITH_VMX test_programs += vmx2xmltest xml2vmxtest endif WITH_VMX -if WITH_VMWARE -test_programs += vmwarevertest -endif WITH_VMWARE - if WITH_YAJL test_programs += virjsontest endif WITH_YAJL @@ -109,13 +105,6 @@ xml2vmxtest_SOURCES = \ xml2vmxtest_LDADD = $(LDADDS) endif WITH_VMX -if WITH_VMWARE -vmwarevertest_SOURCES = \ - vmwarevertest.c \ - testutils.c testutils.h -vmwarevertest_LDADD = $(LDADDS) -endif WITH_VMWARE - 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 4eef28b20a..235d07847b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -525,6 +525,12 @@ if conf.has('WITH_VBOX') ] endif +if conf.has('WITH_VMWARE') + tests += [ + { 'name': 'vmwarevertest' }, + ] +endif + foreach data : tests test_sources = '@0@.c'.format(data['name']) test_bin = executable(