tests: don't fail with newer gnutls

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)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6e15af881fb26bcb59aa1c6d0b6dca0b963be871..5393a6f9bf508c75512fd8ba3ae0337ddd5e4219 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -736,7 +736,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
 
 virnetdevbandwidthtest_SOURCES = \