1b35c9e1e3
Viktor Szakats
2026-03-01
Subject
cmake: rename `testbins` target to `tt`, restore internal option
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
RELEASE-NOTES +1 -1docs/INSTALL-CMAKE.md +2 -2tests/CMakeLists.txt +5 -5tests/certs/CMakeLists.txt +5 -1tests/libtest/CMakeLists.txt +1 -1tests/server/CMakeLists.txt +1 -1tests/tunit/CMakeLists.txt +1 -1tests/unit/CMakeLists.txt +1 -1
RELEASE-NOTES+1 -1
| @@ -63,7 +63,7 @@ This release includes the following bugfixes: | |
| o cmake: normalize uppercase hex winver (for display) [191] | |
| o cmake: omit `curl.rc` from curltool lib [209] | |
| o cmake: reference OpenSSL and ZLIB imported targets only when enabled [41] | |
| - | o cmake: replace internal option with a new `testbins` target [220] |
| + | o cmake: replace internal option with a new `tt` (test tools) target [220] |
| o cmake: silence potential unused var warnings in C++ test snippet [201] | |
| o cmake: silence silly Apple clang warnings in C89 mode, test in CI [14] | |
| o cmake: silence useless compiler warnings triggered by the FASTBuild generator [43] | |
docs/INSTALL-CMAKE.md+2 -2
| @@ -552,12 +552,12 @@ Note: These variables are internal and subject to change. | |
| ## Useful build targets | |
| - | - `testbins`: Build test binaries (servers, tools). |
| - | Individual targets: `curlinfo`, `libtests`, `servers`, `tunits`, `units` |
| - `testdeps`: Build test dependencies (test binaries, test certificates). | |
| Test certificates: `build-certs` (clean with `clean-certs`) | |
| - `tests`: Run tests (`runtests.pl`). Customize via the `TFLAGS` environment variable, e.g. `TFLAGS=1621`. | |
| Other flavors: `test-am`, `test-ci`, `test-event`, `test-full`, `test-nonflaky`, `test-quiet`, `test-torture` | |
| + | - `tt`: Build test binaries (servers, tools). |
| + | Individual targets: `curlinfo`, `libtests`, `servers`, `tunits`, `units` |
| - `curl-pytest`: Run tests (pytest). | |
| Other flavor: `curl-test-ci` | |
| - `curl-examples`: Build examples | |
tests/CMakeLists.txt+5 -5
| @@ -29,21 +29,21 @@ mark_as_advanced(TEST_NGHTTPX) | |
| # Consumed variables: TEST_NGHTTPX | |
| configure_file("config.in" "${CMAKE_CURRENT_BINARY_DIR}/config" @ONLY) | |
| - | add_custom_target(testbins) |
| + | add_custom_target(tt) |
| if(BUILD_CURL_EXE) | |
| - | add_dependencies(testbins "curlinfo") |
| + | add_dependencies(tt "curlinfo") |
| endif() | |
| if(CURL_BUILD_EVERYTHING) | |
| - | set_target_properties(testbins PROPERTIES EXCLUDE_FROM_ALL FALSE) |
| + | set_target_properties(tt PROPERTIES EXCLUDE_FROM_ALL FALSE) |
| endif() | |
| if(CURL_CLANG_TIDY) | |
| add_custom_target(tests-clang-tidy) | |
| - | add_dependencies(testbins tests-clang-tidy) |
| + | add_dependencies(tt tests-clang-tidy) |
| endif() | |
| add_custom_target(testdeps) | |
| - | add_dependencies(testdeps "testbins") |
| + | add_dependencies(testdeps "tt") |
| add_subdirectory(http) | |
| add_subdirectory(server) | |
tests/certs/CMakeLists.txt+5 -1
| @@ -31,7 +31,11 @@ add_custom_command(OUTPUT ${GENERATEDCERTS} | |
| VERBATIM | |
| ) | |
| add_custom_target(build-certs DEPENDS ${GENERATEDCERTS}) | |
| - | add_dependencies(testdeps build-certs) |
| + | |
| + | option(_CURL_SKIP_BUILD_CERTS "Skip building certs with testdeps" OFF) # Internal option to increase perf for build tests |
| + | if(NOT _CURL_SKIP_BUILD_CERTS) |
| + | add_dependencies(testdeps build-certs) |
| + | endif() |
| add_custom_target(clean-certs | |
| COMMAND ${CMAKE_COMMAND} -E remove ${GENERATEDCERTS} | |
tests/libtest/CMakeLists.txt+1 -1
| @@ -52,7 +52,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c" | |
| VERBATIM) | |
| add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c") | |
| - | add_dependencies(testbins ${BUNDLE}) |
| + | add_dependencies(tt ${BUNDLE}) |
| target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) | |
| target_include_directories(${BUNDLE} PRIVATE | |
| "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" | |
tests/server/CMakeLists.txt+1 -1
| @@ -39,7 +39,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c" | |
| VERBATIM) | |
| add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c") | |
| - | add_dependencies(testbins ${BUNDLE}) |
| + | add_dependencies(tt ${BUNDLE}) |
| target_link_libraries(${BUNDLE} ${CURL_NETWORK_AND_TIME_LIBS}) | |
| target_include_directories(${BUNDLE} PRIVATE | |
| "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" | |
tests/tunit/CMakeLists.txt+1 -1
| @@ -39,7 +39,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c" | |
| VERBATIM) | |
| add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c") | |
| - | add_dependencies(testbins ${BUNDLE}) |
| + | add_dependencies(tt ${BUNDLE}) |
| target_link_libraries(${BUNDLE} curltool ${LIB_SELECTED}) | |
| target_include_directories(${BUNDLE} PRIVATE | |
| "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" | |
tests/unit/CMakeLists.txt+1 -1
| @@ -40,7 +40,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c" | |
| add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c") | |
| add_dependencies(${BUNDLE} curlu-unitprotos) | |
| - | add_dependencies(testbins ${BUNDLE}) |
| + | add_dependencies(tt ${BUNDLE}) |
| target_link_libraries(${BUNDLE} curlu) | |
| target_include_directories(${BUNDLE} PRIVATE | |
| "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h", "unitprotos.h" | |