meson: tests: add vmx specific tests

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 406730e3fa90b48b195ab74e1642831381fc0b91..86e8c37583aa8b9abb6271cde81e434239045ff6 100644 (file)
--- 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 235d07847b1ae4546a68bf1f129659a698eb9b1d..6f4fe84e280e5df215e8a073abf030ab04979376 100644 (file)
--- 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(