Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
tests/Makefile.am | 29 +++--------------------------
tests/meson.build | 8 ++++++++
2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f30fc379077..498655d4776 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,10 +20,6 @@ if WITH_QEMU
test_helpers += qemucapsprobe
endif WITH_QEMU
-if WITH_YAJL
-test_programs += virjsontest
-endif WITH_YAJL
-
if WITH_NSS
test_helpers += nsslinktest nssguestlinktest
endif WITH_NSS
@@ -72,13 +68,12 @@ file-access-clean:
endif WITH_LINUX
if WITH_TESTS
-noinst_PROGRAMS = $(test_programs) $(test_helpers)
+noinst_PROGRAMS = $(test_helpers)
else ! WITH_TESTS
-check_PROGRAMS = $(test_programs) $(test_helpers)
+check_PROGRAMS = $(test_helpers)
endif ! WITH_TESTS
-TESTS = $(test_programs) \
- $(test_scripts)
+TESTS = $(test_scripts)
VALGRIND = valgrind --quiet --leak-check=full --trace-children=yes \
--trace-children-skip="*/tools/virsh","*/tests/commandhelper","/usr/bin/*" \
@@ -111,21 +106,3 @@ nssguestlinktest_CFLAGS = \
nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la
nssguestlinktest_LDFLAGS = $(NULL)
endif ! WITH_NSS
-
-if WITH_YAJL
-virmacmaptest_SOURCES = \
- virmacmaptest.c testutils.h testutils.c
-virmacmaptest_LDADD = $(LDADDS)
-
-virnetdevopenvswitchtest_SOURCES = \
- virnetdevopenvswitchtest.c testutils.h testutils.c
-virnetdevopenvswitchtest_LDADD = $(LDADDS)
-
-test_programs += \
- virmacmaptest \
- virnetdevopenvswitchtest
-endif ! WITH_YAJL
-
-virjsontest_SOURCES = \
- virjsontest.c testutils.h testutils.c
-virjsontest_LDADD = $(LDADDS)
diff --git a/tests/meson.build b/tests/meson.build
index 65a1f2b31c4..40acbcee6cd 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -528,6 +528,14 @@ if conf.has('WITH_VMX')
]
endif
+if conf.has('WITH_YAJL')
+ tests += [
+ { 'name': 'virjsontest' },
+ { 'name': 'virmacmaptest' },
+ { 'name': 'virnetdevopenvswitchtest' },
+ ]
+endif
+
foreach data : tests
test_sources = '@0@.c'.format(data['name'])
test_bin = executable(
--
2.26.2
