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)

Conflicts:
	tests/Makefile.am - missing commit 25527ae2 for GNULIB_LIBS

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8388a663501f761fbe3cc317325a0ae5a92820df..40ffe9f304edc3c450fdf101c7ff7b4dbed344d3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,6 +48,9 @@ if WITH_DTRACE_PROBES
 PROBES_O += ../src/libvirt_probes.lo
 endif
 
+GNULIB_LIBS = \
+       ../gnulib/lib/libgnu.la
+
 LDADDS = \
         $(WARN_CFLAGS) \
        $(PROBES_O) \
@@ -558,7 +561,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