cURL / Mailing Lists / curl-library / Single Mail

curl-library

Re: [PATCH 8/8] unit1394.c: plug the curl tool unit test in

From: Daniel Stenberg <daniel_at_haxx.se>
Date: Mon, 6 May 2013 22:59:02 +0200 (CEST)

On Mon, 6 May 2013, Nick Zitzmann wrote:

> This patch breaks making tests with Metalink support enabled. I'm now
> getting this when running "make test":

Yeps. I also just fell into this. Additionally, it seems to not work with
configure --enable-debug and the memory debugging system that provides.

This is my current set of incomplete patches I've tried:

diff --git a/src/Makefile.am b/src/Makefile.am
index 9cf1545..50f7d6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,6 +69,7 @@ curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
  # if unit tests are enabled, build a static library to link them with
  if BUILD_UNITTESTS
  noinst_LTLIBRARIES = libcurltool.la
+libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS)
  libcurltool_la_CFLAGS = -DUNITTESTS
  libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
  libcurltool_la_SOURCES = $(curl_SOURCES)
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index a99b9ee..eca6de8 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -39,5 +39,6 @@ unit1330_SOURCES = unit1330.c $(UNITFILES)
  unit1330_CPPFLAGS = $(AM_CPPFLAGS)

  unit1394_SOURCES = unit1394.c $(UNITFILES)
-unit1394_CPPFLAGS = $(AM_CPPFLAGS)
-
+unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
+unit1394_LDADD = @LIBMETALINK_LIBS@
+unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la

-- 
  / daniel.haxx.se
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html
Received on 2013-05-06