[libvirt PATCH 306/351] meson: tests: add vmware specific tests

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


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 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 ab45bdd6da4..69506b31a3e 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
@@ -113,13 +109,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 7f93d816b44..38f3823cff6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -515,6 +515,12 @@ if conf.has('WITH_VBOX')
   ]
 endif
 
+if conf.has('WITH_VMWARE')
+  tests += [
+    { 'name': 'vmwarevertest' },
+  ]
+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