From 9f390a356ea464183cc11ef44c48968ccdcd36ac Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 25 May 2011 20:22:46 +0200 Subject: unit tests: build adjustment Also define UNITTESTS macro when building unit test sources. Fixing compiler warning: external definition with no prior declaration --- tests/unit/Makefile.am | 8 ++++---- tests/unit/Makefile.inc | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index bdee6c102..cdd32a5e1 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -40,7 +40,7 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/tests/libtest \ + -I$(top_srcdir)/tests/libtest \ -I$(top_builddir)/ares \ -I$(top_srcdir)/ares else @@ -49,16 +49,16 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/tests/libtest + -I$(top_srcdir)/tests/libtest endif if CURLDEBUG EXTRA_DIST = Makefile.inc -LDADD = $(top_builddir)/tests/libtest/first.o $(top_builddir)/lib/libcurlu.la \ - @CURL_LIBS@ +LDADD = $(top_builddir)/lib/libcurlu.la @CURL_LIBS@ DEPENDENCIES = $(top_builddir)/lib/libcurlu.la +CFLAGS += -DUNITTESTS # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index aef687113..ff85e7b37 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -1,6 +1,8 @@ # these files are used in every single unit test program -UNITFILES = curlcheck.h +UNITFILES = curlcheck.h \ + $(top_srcdir)/tests/libtest/test.h \ + $(top_srcdir)/tests/libtest/first.c # These are all unit test programs noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 -- cgit v1.2.3