[libvirt] [PATCH v2 4/5] tests: Always build TLS related tests

Michal Privoznik mprivozn at redhat.com
Tue Jun 5 11:55:57 UTC 2018


Since GnuTLS is required there is no way to go with !WITH_GNUTLS
branch and just distribute these files.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/Makefile.am | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1ce3dbb50f..99c79e3208 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -227,10 +227,9 @@ test_programs += \
 	virnetsockettest \
 	virnetdaemontest \
 	virnetserverclienttest \
+	virnettlscontexttest \
+	virnettlssessiontest \
 	$(NULL)
-if WITH_GNUTLS
-test_programs += virnettlscontexttest virnettlssessiontest
-endif WITH_GNUTLS
 endif WITH_REMOTE
 
 if WITH_LINUX
@@ -1027,7 +1026,6 @@ virnetserverclientmock_la_SOURCES = \
 virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 virnetserverclientmock_la_LIBADD = $(MOCKLIBS_LIBS)
 
-if WITH_GNUTLS
 virnettlscontexttest_SOURCES = \
 	virnettlscontexttest.c \
 	virnettlshelpers.h virnettlshelpers.c \
@@ -1046,12 +1044,6 @@ virnettlssessiontest_LDADD += -ltasn1
 else ! HAVE_LIBTASN1
 EXTRA_DIST += pkix_asn1_tab.c
 endif ! HAVE_LIBTASN1
-else ! WITH_GNUTLS
-EXTRA_DIST += \
-	virnettlscontexttest.c virnettlssessiontest.c \
-	virnettlshelpers.h virnettlshelpers.c \
-	testutils.h testutils.c pkix_asn1_tab.c
-endif ! WITH_GNUTLS
 
 virtimetest_SOURCES = \
 	virtimetest.c testutils.h testutils.c
-- 
2.16.4




More information about the libvir-list mailing list