tests/unit: hook up unitprotos to the `units-clang-tidy` target

To make `ninja units-clang-tidy` target work without manually building
core components first.

Also rename the clang-tidy test target generator macro to align its name
with the built-in `add_custom_target()` function.

Follow-up to c9bb9cd165c1b25c2fe005befdcfe479fc9b68e1 #17750

Closes #17810

diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake
index 362ccc3dc66dac52e78dc1aaf283264efeae0c28..2dec0ffe6a35e07b9206df1289a9f7f99b8c113b 100644 (file)
--- a/CMake/Macros.cmake
+++ b/CMake/Macros.cmake
@@ -97,7 +97,7 @@ macro(curl_prefill_type_size _type _size)
 endmacro()
 
 # Create a clang-tidy target for test targets
-macro(curl_clang_tidy_tests _target)
+macro(curl_add_clang_tidy_test_target _target_clang_tidy _target)
   if(CURL_CLANG_TIDY)
 
     # Collect header directories and macro definitions from lib dependencies
@@ -143,11 +143,11 @@ macro(curl_clang_tidy_tests _target)
       list(APPEND _sources "${_source}")
     endforeach()
 
-    add_custom_target("${_target}-clang-tidy" USES_TERMINAL
+    add_custom_target(${_target_clang_tidy} USES_TERMINAL
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
       COMMAND ${CMAKE_C_CLANG_TIDY} ${_sources} -- ${_includes} ${_definitions}
       DEPENDS ${_sources})
-    add_dependencies(tests-clang-tidy "${_target}-clang-tidy")
+    add_dependencies(tests-clang-tidy ${_target_clang_tidy})
 
     unset(_includes_d)
     unset(_includes_t)

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index c579d24a412252e609e9cfb4b54baddf6d277a88..0d8af5683279b6918d79bb797d3598e6667f8149 100644 (file)
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -49,4 +49,4 @@ target_include_directories(${BUNDLE} PRIVATE
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
-curl_clang_tidy_tests(${BUNDLE} ${FIRST_C} ${TESTS_C})
+curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})

diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index bfd29851cf1b7d45f1fadd215c2fa761332caf4f..006c46d07e3985a02a1e6fade587938e3b0ffa7f 100644 (file)
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -60,4 +60,4 @@ set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
-curl_clang_tidy_tests(${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})
+curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})

diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 8390d316c1e42e8812f774216af0dfaa65f329d9..549b5536fcf5995405c688ff7705e716c442c35c 100644 (file)
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -55,4 +55,4 @@ if(WIN32)
 endif()
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
-curl_clang_tidy_tests(${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})
+curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})

diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index 60e9dad7bcb9ac8080ad663e8ae2cdd1549184d3..2ef294f5138e284f58b1e95eb91b44bee2d7b652 100644 (file)
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -49,4 +49,4 @@ set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES" "CURL_DISABLE_DEPRECATION")
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
-curl_clang_tidy_tests(${BUNDLE} ${FIRST_C} ${TESTS_C})
+curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 6ae9c171889d9099864c90eaec9c37b6a761166f..879bfd29a522b12e0969f14715134d6a1ccaab8e 100644 (file)
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -50,4 +50,7 @@ set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIE
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL")
 set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
 
-curl_clang_tidy_tests(${BUNDLE} ${FIRST_C} ${TESTS_C})
+curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})
+if(TARGET "${BUNDLE}-clang-tidy")
+  add_dependencies("${BUNDLE}-clang-tidy" curlu-unitprotos)
+endif()