mirror of
https://github.com/curl/curl.git
synced 2026-07-05 15:37:16 +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
|
|
@ -244,7 +244,6 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
|
|||
- `CURL_LTO`: Enable compiler Link Time Optimizations. Default: `OFF`
|
||||
- `CURL_STATIC_CRT`: Build libcurl with static CRT with MSVC (`/MT`) (requires UCRT, static libcurl or no curl executable). Default: `OFF`
|
||||
- `CURL_TARGET_WINDOWS_VERSION`: Minimum target Windows version as hex string.
|
||||
- `CURL_TEST_BUNDLES`: Build tests into single-binary bundles. Default: `OFF`
|
||||
- `CURL_WERROR`: Turn compiler warnings into errors. Default: `OFF`
|
||||
- `ENABLE_CURLDEBUG`: Enable TrackMemory debug feature. Default: =`ENABLE_DEBUG`
|
||||
- `ENABLE_CURL_MANUAL`: Build the man page for curl and enable its `-M`/`--manual` option. Default: `ON`
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Get 'DPAGES' variable
|
||||
# Get SUPPORT, DPAGES variables
|
||||
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
|
|||
MANPAGE = curl.1
|
||||
ASCIIPAGE = curl.txt
|
||||
|
||||
# Get SUPPORT, DPAGES variables
|
||||
include Makefile.inc
|
||||
|
||||
EXTRA_DIST = $(DPAGES) MANPAGE.md $(SUPPORT) CMakeLists.txt mainpage.idx
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Shared between Makefile.am and CMakeLists.txt
|
||||
# Shared between CMakeLists.txt and Makefile.am
|
||||
|
||||
SUPPORT = \
|
||||
_AUTHORS.md \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
add_custom_target(curl-examples)
|
||||
|
||||
# Get 'check_PROGRAMS' variable
|
||||
# Get check_PROGRAMS variable
|
||||
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
|
||||
|
|
@ -37,7 +37,6 @@ foreach(_target IN LISTS check_PROGRAMS)
|
|||
if(LIB_SELECTED STREQUAL LIB_STATIC AND WIN32)
|
||||
set_property(TARGET ${_target_name} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_STATICLIB")
|
||||
endif()
|
||||
set_target_properties(${_target_name} PROPERTIES
|
||||
OUTPUT_NAME "${_target}" UNITY_BUILD OFF
|
||||
PROJECT_LABEL "Example ${_target}")
|
||||
set_target_properties(${_target_name} PROPERTIES OUTPUT_NAME "${_target}" PROJECT_LABEL "Example ${_target}"
|
||||
UNITY_BUILD OFF)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
|
|||
# This might hold -Werror
|
||||
CFLAGS += @CURL_CFLAG_EXTRAS@
|
||||
|
||||
# Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
|
||||
# Get check_PROGRAMS variable
|
||||
include Makefile.inc
|
||||
|
||||
all: $(check_PROGRAMS)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Shared between CMakeLists.txt and Makefile.am
|
||||
|
||||
# These are all libcurl example programs to be test compiled
|
||||
check_PROGRAMS = \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Get 'man_MANS' variable
|
||||
# Get man_MANS variable
|
||||
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
|
|||
SUBDIRS = opts
|
||||
|
||||
if BUILD_DOCS
|
||||
# Get man_MANS variable
|
||||
include Makefile.inc
|
||||
|
||||
CURLPAGES = $(man_MANS:.3=.md)
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
|
||||
# Shared between Makefile.am and CMakeLists.txt
|
||||
# Shared between CMakeLists.txt and Makefile.am
|
||||
|
||||
man_MANS = \
|
||||
curl_easy_cleanup.3 \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Get 'man_MANS' variable
|
||||
# Get man_MANS variable
|
||||
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
AUTOMAKE_OPTIONS = foreign no-dependencies
|
||||
|
||||
if BUILD_DOCS
|
||||
# Get man_MANS variable
|
||||
include Makefile.inc
|
||||
|
||||
CURLPAGES = $(man_MANS:.3=.md)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
# Shared between Makefile.am and CMakeLists.txt
|
||||
# Shared between CMakeLists.txt and Makefile.am
|
||||
|
||||
man_MANS = \
|
||||
CURLINFO_ACTIVESOCKET.3 \
|
||||
|
|
|
|||
|
|
@ -312,11 +312,9 @@ SPDX-License-Identifier: curl
|
|||
|
||||
### test bundles
|
||||
|
||||
The `--enable-test-bundles` (autotools) and `-DCURL_TEST_BUNDLES=ON` (cmake)
|
||||
build options allow to build tests bundled into single executables, one for
|
||||
libtests, one for unit tests and one for servers.
|
||||
The executables' first argument is the name of libtest, unit test or server
|
||||
respectively.
|
||||
Individual tests are bundled into single executables, one for libtests, one
|
||||
for unit tests and one for servers. The executables' first argument is
|
||||
the name of libtest, unit test or server respectively.
|
||||
In these executables, the build process automatically renames the entry point
|
||||
to a unique symbol. `test` becomes `test_<tool>`, e.g. `test_lib1598` or
|
||||
`test_unit1305`. For servers `main` becomes `main_sws` for the `sws` server,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue