mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-11 09:17:52 +03:00
meson: tests: add yajl specific tests
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
parent
fca5e46957
commit
5369dd8f6e
@ -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
|
||||
@ -71,10 +67,9 @@ file-access-clean:
|
||||
> test_file_access.txt
|
||||
endif WITH_LINUX
|
||||
|
||||
noinst_PROGRAMS = $(test_programs) $(test_helpers)
|
||||
noinst_PROGRAMS = $(test_helpers)
|
||||
|
||||
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/*" \
|
||||
@ -107,21 +102,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)
|
||||
|
@ -538,6 +538,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(
|
||||
|
Loading…
Reference in New Issue
Block a user