提交 00c49704 编写于 作者: M Michal Privoznik

tests: Run virmacmaptest iff WITH_YAJL

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: NMichal Privoznik <mprivozn@redhat.com>
上级 5dc6169b
...@@ -192,7 +192,6 @@ test_programs = virshtest sockettest \ ...@@ -192,7 +192,6 @@ test_programs = virshtest sockettest \
domainconftest \ domainconftest \
virhostdevtest \ virhostdevtest \
vircaps2xmltest \ vircaps2xmltest \
virmacmaptest \
virnetdevtest \ virnetdevtest \
virtypedparamtest \ virtypedparamtest \
$(NULL) $(NULL)
...@@ -408,7 +407,6 @@ test_libraries = libshunload.la \ ...@@ -408,7 +407,6 @@ test_libraries = libshunload.la \
virhostcpumock.la \ virhostcpumock.la \
nssmock.la \ nssmock.la \
domaincapsmock.la \ domaincapsmock.la \
virmacmapmock.la \
$(NULL) $(NULL)
if WITH_QEMU if WITH_QEMU
test_libraries += libqemumonitortestutils.la \ test_libraries += libqemumonitortestutils.la \
...@@ -1158,6 +1156,7 @@ nssguestlinktest_CFLAGS = \ ...@@ -1158,6 +1156,7 @@ nssguestlinktest_CFLAGS = \
nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la
nssguestlinktest_LDFLAGS = $(NULL) nssguestlinktest_LDFLAGS = $(NULL)
if WITH_YAJL
virmacmapmock_la_SOURCES = \ virmacmapmock_la_SOURCES = \
virmacmapmock.c virmacmapmock.c
virmacmapmock_la_CFLAGS = $(AM_CFLAGS) virmacmapmock_la_CFLAGS = $(AM_CFLAGS)
...@@ -1166,9 +1165,15 @@ virmacmapmock_la_LIBADD = $(MOCKLIBS_LIBS) ...@@ -1166,9 +1165,15 @@ virmacmapmock_la_LIBADD = $(MOCKLIBS_LIBS)
virmacmaptest_SOURCES = \ virmacmaptest_SOURCES = \
virmacmaptest.c testutils.h testutils.c virmacmaptest.c testutils.h testutils.c
virmacmaptest_CLFAGS = $(AM_CFLAGS); virmacmaptest_CLFAGS = $(AM_CFLAGS)
virmacmaptest_LDADD = $(LDADDS) 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_SOURCES = \
virnetdevtest.c testutils.h testutils.c virnetdevtest.c testutils.h testutils.c
virnetdevtest_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) virnetdevtest_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册