[libvirt PATCH 307/351] meson: tests: add vmx specific tests
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
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 69506b31a3e..f30fc379077 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
@@ -97,18 +93,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 38f3823cff6..65a1f2b31c4 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -521,6 +521,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(
--
2.26.2