diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-06-01 21:39:18 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-06-01 21:40:09 +0200 |
| commit | aa76dec33af3d93f046143e7e7c853c49ef54380 (patch) | |
| tree | b6403245364c2c24473d98bf81f9a78735da3732 /tests | |
| parent | d6bb8dcc23b5e607e2f30c63d9cf13371219df54 (diff) | |
unit tests: more build adjustments
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/unit/Makefile.am | 19 | ||||
| -rw-r--r-- | tests/unit/Makefile.inc | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 045349350..85dd7999a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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) diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index c77a516d5..d290a1dc7 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -48,30 +48,21 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ + -I$(top_srcdir)/lib \ -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 diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index ff85e7b37..da24f4c2e 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -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) |