External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: don't fail with newer gnutls

Browse Source 
gnutls-3.3.0 and newer leaves 2 FDs open in order to be backwards
compatible when it comes to chrooted binaries [1].  Linking
commandhelper with gnutls then leaves these two FDs open and
commandtest fails thanks to that.  This patch does not link
commandhelper with libvirt.la, but rather only the utilities making
the test pass.

Based on suggestion from Daniel [2].

[1] http://lists.gnutls.org/pipermail/gnutls-help/2014-April/003429.html
[2] https://www.redhat.com/archives/libvir-list/2014-April/msg01119.html

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit 4cbc15d037e1cd8abf5c4aa6acc30d83ae13e34d)

Conflicts:
	tests/Makefile.am - missing commit 25527ae2 for GNULIB_LIBS
This commit is contained in:
Martin Kletzander 2014-05-02 09:55:52 +02:00 committed by Eric Blake
parent 3e626db568
commit 7d266f4438
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Makefile.am
View File

@ -48,6 +48,9 @@ if WITH_DTRACE_PROBES
PROBES_O += ../src/libvirt_probes.lo
endif
GNULIB_LIBS = \
../gnulib/lib/libgnu.la
LDADDS = \
$(WARN_CFLAGS) \
$(NO_INDIRECT_LDFLAGS) \
@ -592,7 +595,13 @@ commandtest_LDADD = $(LDADDS)
commandhelper_SOURCES = \
commandhelper.c
commandhelper_LDADD = $(LDADDS)
commandhelper_LDADD = \
$(WARN_CFLAGS) \
$(NO_INDIRECT_LDFLAGS) \
$(PROBES_O) \
../src/libvirt_util.la \
$(GNULIB_LIBS)
commandhelper_LDFLAGS = -static
if WITH_LIBVIRTD