On Mon, Apr 27, 2015 at 03:07:06PM +0200, Martin Kletzander wrote:
On Mon, Apr 27, 2015 at 01:40:53PM +0300, Pavel Fedin wrote:
>This fix should completely close
>https://bugzilla.redhat.com/show_bug.cgi?id=1214605
>
>Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com>
>
>tests/Makefile.am | 40 +++++++++++++++++++++++++++-------------
>1 file changed, 27 insertions(+), 13 deletions(-)
>
Firstly, this patch is mangled by some mail client, try using
git's send-email so it's properly applicable. I wouldn't normally do
that, but I fixed it this time ;)
Secondly, I think it should fix it, but you added one line indented
with spaces while others are using tabs. I must say that's quite OK
since we are not consistent in that especially with the mock libs
rules and I'm going to clean this in a follow-up patch.
>diff --git a/tests/Makefile.am b/tests/Makefile.am
>index 09dc2cb..e69235b 100644
>--- a/tests/Makefile.am
>+++ b/tests/Makefile.am
>@@ -553,7 +553,8 @@ qemuxml2argvmock_la_SOURCES = \
> qemuxml2argvmock.c
>qemuxml2argvmock_la_CFLAGS = $(AM_CFLAGS)
>qemuxml2argvmock_la_LDFLAGS = -module -avoid-version \
>- -rpath /evil/libtool/hack/to/force/shared/lib/creation
>+ -rpath /evil/libtool/hack/to/force/shared/lib/creation \
>+ $(MINGW_EXTRA_LDFLAGS)
>
>qemuxml2xmltest_SOURCES = \
> qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \
>@@ -614,7 +615,8 @@ qemucaps2xmlmock_la_SOURCES = \
> qemucaps2xmlmock.c
>qemucaps2xmlmock_la_CFLAGS = $(AM_CFLAGS)
>qemucaps2xmlmock_la_LDFLAGS = -module -avoid-version \
>- -rpath /evil/libtool/hack/to/force/shared/lib/creation
>+ -rpath /evil/libtool/hack/to/force/shared/lib/creation \
>+ $(MINGW_EXTRA_LDFLAGS)
>
>qemuagenttest_SOURCES = \
> qemuagenttest.c \
>@@ -722,7 +724,8 @@ bhyvexml2argvmock_la_SOURCES = \
> bhyvexml2argvmock.c
>bhyvexml2argvmock_la_CFLAGS = $(AM_CFLAGS)
>bhyvexml2argvmock_la_LDFLAGS = -module -avoid-version \
>- -rpath
>/evil/libtool/hack/to/force/shared/lib/creation
>+ -rpath
>/evil/libtool/hack/to/force/shared/lib/creation \
>+ $(MINGW_EXTRA_LDFLAGS)
>
>bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la
>if WITH_STORAGE
>@@ -930,7 +933,9 @@ virnetserverclientmock_la_SOURCES = \
> virnetserverclientmock.c
>virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS)
>virnetserverclientmock_la_LDFLAGS = -module -avoid-version \
>- -rpath /evil/libtool/hack/to/force/shared/lib/creation
>+ -rpath /evil/libtool/hack/to/force/shared/lib/creation \
>+ $(GNULIB_LIBS) \
Thirdly, I wonder why you needed to add this, is gnulib really needed? is that
because of those strdup()s in the file? Why doesn't it fail with gcc
then?
Fourthly (is that even a word?), I'd ACK this and push it, but just
please let me know whether GNULIB_LIBS is really needed here, so I
know if I need to amend this or not.
I just realized that *if* this is still an issue, it is a different
from the original one and it would be nice to have it in a different
patch then. I'm pushing it without gnulib libs added, feel free to
post another patch if there's still an issue with any test.
Martin