External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

tests: Run nss*test iff WITH_NSS

Browse Source 
If the nss module is disabled we shouldn't run the tests that
include it either.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-12-25 15:02:48 +01:00
parent 09da661006
commit a94769ce27
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Makefile.am
View File

@ -205,7 +205,6 @@ test_libraries = libshunload.la \
virnetdevmock.la \ virnetdevmock.la \
virrandommock.la \ virrandommock.la \
virhostcpumock.la \ virhostcpumock.la \
nssmock.la \
domaincapsmock.la \ domaincapsmock.la \
$(NULL) $(NULL)
@ -361,6 +360,7 @@ endif WITH_LINUX
if WITH_NSS if WITH_NSS
test_helpers += nsslinktest nssguestlinktest test_helpers += nsslinktest nssguestlinktest
test_programs += nsstest nssguesttest test_programs += nsstest nssguesttest
test_libraries += nssmock.la
endif WITH_NSS endif WITH_NSS
test_programs += storagevolxml2xmltest storagepoolxml2xmltest test_programs += storagevolxml2xmltest storagepoolxml2xmltest
@ -1102,6 +1102,7 @@ virhostcpumock_la_CFLAGS = $(AM_CFLAGS)
virhostcpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virhostcpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS) virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS)
if WITH_NSS
nsstest_SOURCES = \ nsstest_SOURCES = \
nsstest.c testutils.h testutils.c nsstest.c testutils.h testutils.c
nsstest_CFLAGS = \ nsstest_CFLAGS = \
@ -1143,6 +1144,9 @@ nssguestlinktest_CFLAGS = \
-I$(top_srcdir)/tools/nss -I$(top_srcdir)/tools/nss
nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la
nssguestlinktest_LDFLAGS = $(NULL) nssguestlinktest_LDFLAGS = $(NULL)
else ! WITH_NSS
EXTRA_DIST += nsstest.c nssmock.c nsslinktest.c
endif ! WITH_NSS
if WITH_YAJL if WITH_YAJL
virmacmapmock_la_SOURCES = \ virmacmapmock_la_SOURCES = \