]> xenbits.xensource.com Git - libvirt.git/commitdiff
tests: Run nss*test iff WITH_NSS
authorMichal Privoznik <mprivozn@redhat.com>
Sun, 25 Dec 2016 14:02:48 +0000 (15:02 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 2 Jan 2017 12:25:42 +0000 (13:25 +0100)
If the nss module is disabled we shouldn't run the tests that
include it either.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
tests/Makefile.am

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