Commit 9f390a35 authored by Yang Tse's avatar Yang Tse
Browse files

unit tests: build adjustment 

Also define UNITTESTS macro when building unit test sources.

Fixing compiler warning: external definition with no prior declaration
parent 017ee34b

tests/libtest/first.c

+3 −0
Original line number Diff line number Diff line
@@ -49,7 +49,10 @@ char *libtest_arg2=NULL; 
char *libtest_arg3=NULL;

int test_argc;

char **test_argv;



#ifdef UNITTESTS

int unitfail; /* for unittests */

#endif



int main(int argc, char **argv)

{

tests/libtest/test.h

+3 −0
Original line number Diff line number Diff line
@@ -73,3 +73,6 @@ extern int select_test(int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, 
extern int test(char *URL); /* the actual test function provided by each

                               individual libXXX.c file */



#ifdef UNITTESTS

extern int unitfail;

#endif

tests/unit/Makefile.am

+4 −4
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ 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)

tests/unit/Makefile.inc

+3 −1
Original line number Diff line number Diff line 
# 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