From 1b35c9e1e3bb84336082a8fde12eeeafe6bfa3b2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 28 Feb 2026 01:33:05 +0100 Subject: [PATCH] cmake: rename `testbins` target to `tt`, restore internal option To make it easy to type. The internal option is used in CI. Follow-up to aae361242f30eafacf46085ed731b1524bfd3be9 #20708 Closes #20768 --- RELEASE-NOTES | 2 +- docs/INSTALL-CMAKE.md | 4 ++-- tests/CMakeLists.txt | 10 +++++----- tests/certs/CMakeLists.txt | 6 +++++- tests/libtest/CMakeLists.txt | 2 +- tests/server/CMakeLists.txt | 2 +- tests/tunit/CMakeLists.txt | 2 +- tests/unit/CMakeLists.txt | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index fe6ba29c95..838c105b57 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -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] diff --git a/docs/INSTALL-CMAKE.md b/docs/INSTALL-CMAKE.md index 9ef9ba6aaa..9c92e4b4ca 100644 --- a/docs/INSTALL-CMAKE.md +++ b/docs/INSTALL-CMAKE.md @@ -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 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7edfaa7ed8..d751a69f2c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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) diff --git a/tests/certs/CMakeLists.txt b/tests/certs/CMakeLists.txt index 399483a738..d0e1f55b85 100644 --- a/tests/certs/CMakeLists.txt +++ b/tests/certs/CMakeLists.txt @@ -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} diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 60c8676568..7991a11486 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -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" diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 716724ab05..bf1431c7fc 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -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" diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt index a10d240a08..c6ac279a66 100644 --- a/tests/tunit/CMakeLists.txt +++ b/tests/tunit/CMakeLists.txt @@ -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" diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 8d27fc0a5b..46710ce1ea 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -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"