unit tests: more build adjustments (aa76dec3) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

configure.ac

+2 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,8 @@ AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
		CURL_CHECK_CURLDEBUG
		AM_CONDITIONAL(CURLDEBUG, test x$want_curldebug = xyes)

		AM_CONDITIONAL(BUILD_UNITTESTS, test x$want_curldebug = xyes)

		dnl **********************************************************************
		dnl Compilation based checks should not be done before this point.
		dnl **********************************************************************

+9 −9

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ endif
		# For the full guide on libcurl ABI rules, see docs/libcurl/ABI

		if NO_UNDEFINED
		# The -no-undefined flag is CRUCIAL for this to build fine on Cygwin.
		# The -no-undefined flag is crucial to build fine on some platforms
		UNDEF = -no-undefined
		endif

		@@ -116,18 +116,18 @@ if MIMPURE
		MIMPURE = -mimpure-text
		endif

		LINKFLAGS=$(UNDEF) $(MIMPURE) $(LIBCURL_LIBS)
		libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS)

		libcurl_la_LDFLAGS = $(LINKFLAGS) $(VERSIONINFO)

		# as unit testing will compile and link everything an extra time, we only
		# do it if debug is enabled
		if CURLDEBUG
		# unit testing static library built only along with unit tests
		if BUILD_UNITTESTS
		noinst_LTLIBRARIES = libcurlu.la
		libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNITTESTS
		libcurlu_la_LDFLAGS = -static $(LINKFLAGS)
		else
		noinst_LTLIBRARIES =
		endif

		libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNITTESTS
		libcurlu_la_LDFLAGS = -static $(LIBCURL_LIBS)

		# Makefile.inc provides the CSOURCES and HHEADERS defines
		include Makefile.inc

+8 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,14 @@ EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl getpart.pm \
		serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \
		certs/srp-verifier-conf certs/srp-verifier-db

		SUBDIRS = data server libtest unit
		if BUILD_UNITTESTS
		BUILD_UNIT = unit
		else
		BUILD_UNIT =
		endif

		SUBDIRS = data server libtest $(BUILD_UNIT)
		DIST_SUBDIRS = $(SUBDIRS) unit

		PERLFLAGS = -I$(srcdir)

+5 −14

Original line number	Diff line number	Diff line
		@@ -52,26 +52,17 @@ INCLUDES = -I$(top_builddir)/include/curl \
		-I$(top_srcdir)/tests/libtest
		endif

		if CURLDEBUG

		EXTRA_DIST = Makefile.inc

		LDADD = $(top_builddir)/lib/libcurlu.la @CURL_LIBS@
		DEPENDENCIES = $(top_builddir)/lib/libcurlu.la
		AM_CPPFLAGS = -DUNITTESTS

		# Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,
		# noinst_PROGRAMS, lib_SOURCES, and lib_CFLAGS)
		# Makefile.inc provides neat definitions
		include Makefile.inc

		if NO_UNDEFINED
		# The -no-undefined flag is crucial to build fine on some platforms
		UNDEF = -no-undefined
		endif


		if BUILD_UNITTESTS
		noinst_PROGRAMS = $(UNITPROGS)
		else
		# do nothing if debug was not enabled
		all:

		noinst_PROGRAMS =
		endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ UNITFILES = curlcheck.h \
		$(top_srcdir)/tests/libtest/first.c

		# These are all unit test programs
		noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307
		UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307

		unit1300_SOURCES = unit1300.c $(UNITFILES)
		unit1301_SOURCES = unit1301.c $(UNITFILES)