mirror of
https://github.com/curl/curl.git
synced 2026-08-26 14:13:35 +03:00
tests: always make bundles, adapt build and tests
Make test bundles the default. Drop non-bundle build mode.
Also do all the optimizations and tidy-ups this allows, simpler builds,
less bundle exceptions, streamlined build mechanics.
Also rework the init/deinit macro magic for unit tests. The new method
allows using unique init/deinit function names, and calling them with
arguments. This is in turn makes it possible to reduce the use of global
variables.
Note this drop existing build options `-DCURL_TEST_BUNDLES=` from cmake
and `--enable-test-bundles` / `--disable-test-bundles` from autotools.
Also:
- rename test entry functions to have unique names: `test_<testname>`
This removes the last exception that was handled in the generator.
- fix `make dist` to not miss test sources with test bundles enabled.
- sync and merge `tests/mk-bundle.pl` into `scripts/mk-unity.pl`.
- mk-unity.pl: add `--embed` option and use it when `CURL_CLANG_TIDY=ON`
to ensure that `clang-tidy` does not miss external test C sources.
(because `clang-tidy` ignores code that's #included.)
- tests/unit: drop no-op setup/stop functions.
- tests: reduce symbol scopes, global macros, other fixes and tidy-ups.
- tool1621: fix to run, also fix it to pass.
- sockfilt: fix Windows compiler warning in certain unity include order,
by explicitly including `warnless.h`.
Follow-up to 6897aeb105 #17468
Closes #17590
This commit is contained in:
parent
1cdac95e2e
commit
2c27a67daa
386 changed files with 2996 additions and 4164 deletions
|
|
@ -21,8 +21,16 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Shared between CMakeLists.txt and Makefile.am
|
||||
|
||||
SERVERPROGS = resolve rtspd sockfilt sws tftpd socksd mqttd dnsd
|
||||
BUNDLE = servers
|
||||
BUNDLE_SRC = servers.c
|
||||
|
||||
# Files referenced from the bundle source
|
||||
FIRSTFILES = first.c first.h
|
||||
|
||||
# Common files used by test programs
|
||||
UTILS = getpart.c getpart.h util.c util.h
|
||||
|
||||
MEMDEBUG = \
|
||||
../../lib/memdebug.c \
|
||||
|
|
@ -30,6 +38,7 @@ MEMDEBUG = \
|
|||
|
||||
CURLX_SRCS = \
|
||||
../../lib/curlx/base64.c \
|
||||
../../lib/curlx/inet_pton.c \
|
||||
../../lib/curlx/multibyte.c \
|
||||
../../lib/curlx/nonblock.c \
|
||||
../../lib/curlx/strparse.c \
|
||||
|
|
@ -39,74 +48,13 @@ CURLX_SRCS = \
|
|||
../../lib/curlx/warnless.c \
|
||||
../../lib/curlx/winapi.c
|
||||
|
||||
CURLX_HDRS = \
|
||||
../../lib/curlx/base64.h \
|
||||
../../lib/curlx/curlx.h \
|
||||
../../lib/curlx/multibyte.h \
|
||||
../../lib/curlx/nonblock.h \
|
||||
../../lib/curlx/timediff.h \
|
||||
../../lib/curlx/timeval.h \
|
||||
../../lib/curlx/version_win32.h \
|
||||
../../lib/curlx/warnless.h \
|
||||
../../lib/curlx/winapi.h
|
||||
|
||||
UTIL = \
|
||||
getpart.c \
|
||||
getpart.h \
|
||||
util.c \
|
||||
util.h \
|
||||
server_setup.h
|
||||
|
||||
FIRSTFILES = \
|
||||
first.c \
|
||||
first.h
|
||||
|
||||
INET_PTON = \
|
||||
../../lib/curlx/inet_pton.c
|
||||
|
||||
resolve_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
|
||||
resolve.c
|
||||
resolve_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
resolve_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
rtspd_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
|
||||
server_sockaddr.h \
|
||||
rtspd.c
|
||||
rtspd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
rtspd_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
sockfilt_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) $(INET_PTON) \
|
||||
server_sockaddr.h \
|
||||
sockfilt.c
|
||||
sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
sockfilt_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
socksd_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) $(INET_PTON) \
|
||||
server_sockaddr.h \
|
||||
socksd.c
|
||||
socksd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
socksd_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
mqttd_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
|
||||
server_sockaddr.h \
|
||||
mqttd.c
|
||||
mqttd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
mqttd_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
sws_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) $(INET_PTON) \
|
||||
server_sockaddr.h \
|
||||
sws.c
|
||||
sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
sws_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
tftpd_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
|
||||
server_sockaddr.h \
|
||||
tftpd.c \
|
||||
tftp.h
|
||||
tftpd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
tftpd_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
dnsd_SOURCES = $(MEMDEBUG) $(CURLX_SRCS) $(CURLX_HDRS) $(UTIL) \
|
||||
dnsd.c
|
||||
dnsd_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
|
||||
dnsd_CFLAGS = $(AM_CFLAGS)
|
||||
# All test servers
|
||||
TESTFILES = \
|
||||
dnsd.c \
|
||||
mqttd.c \
|
||||
resolve.c \
|
||||
rtspd.c \
|
||||
sockfilt.c \
|
||||
socksd.c \
|
||||
sws.c \
|
||||
tftpd.c
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue