Since the internal implementation relies on a json parser being available, it make no sense to run this test if there's none available. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- tests/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ecd04e895..62c5124e6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -192,7 +192,6 @@ test_programs = virshtest sockettest \ domainconftest \ virhostdevtest \ vircaps2xmltest \ - virmacmaptest \ virnetdevtest \ virtypedparamtest \ $(NULL) @@ -408,7 +407,6 @@ test_libraries = libshunload.la \ virhostcpumock.la \ nssmock.la \ domaincapsmock.la \ - virmacmapmock.la \ $(NULL) if WITH_QEMU test_libraries += libqemumonitortestutils.la \ @@ -1158,6 +1156,7 @@ nssguestlinktest_CFLAGS = \ nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDFLAGS = $(NULL) +if WITH_YAJL virmacmapmock_la_SOURCES = \ virmacmapmock.c virmacmapmock_la_CFLAGS = $(AM_CFLAGS) @@ -1166,9 +1165,15 @@ virmacmapmock_la_LIBADD = $(MOCKLIBS_LIBS) virmacmaptest_SOURCES = \ virmacmaptest.c testutils.h testutils.c -virmacmaptest_CLFAGS = $(AM_CFLAGS); +virmacmaptest_CLFAGS = $(AM_CFLAGS) virmacmaptest_LDADD = $(LDADDS) +test_libraries += virmacmapmock.la +test_programs += virmacmaptest +else ! WITH_YAJL +EXTRA_DIST += virmacmapmock.c virmacmaptest.c +endif ! WITH_YAJL + virnetdevtest_SOURCES = \ virnetdevtest.c testutils.h testutils.c virnetdevtest_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) -- 2.11.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
