mirror of
https://github.com/curl/curl.git
synced 2026-06-05 10:54:15 +03:00
Replace existing `mk-unity.pl` `--embed` workaround with running
`clang-tidy` manually on individual test source instead. This aligns
with how clang-tidy works and removes `mk-unity.pl` from the solution.
Also:
- mqttd: fix potentially uninitialized buffer by zero filling it.
```
tests/server/mqttd.c:484:41: error: The left operand of '<<' is a garbage value
[clang-analyzer-core.UndefinedBinaryOperatorResult,-warnings-as-errors]
484 | payload_len = (size_t)(buffer[10] << 8) | buffer[11];
| ^
[...]
tests/server/mqttd.c:606:45: error: The left operand of '<<' is a garbage value
[clang-analyzer-core.UndefinedBinaryOperatorResult,-warnings-as-errors]
606 | topiclen = (size_t)(buffer[1 + bytes] << 8) | buffer[2 + bytes];
| ^
```
- sockfilt: fix potential out-of-bound pointer:
```
tests/server/sockfilt.c:1128:33: error: The 2nd argument to 'send' is a buffer
with size 17010 but should be a buffer with size equal to or greater than
the value of the 3rd argument (which is 18446744073709551615)
[clang-analyzer-unix.StdCLibraryFunctions,-warnings-as-errors]
1128 | ssize_t bytes_written = swrite(sockfd, buffer, buffer_len);
| ^
```
- clang-tidy: suppress bogus `bzero()` warnings that happens
inside the notorious `FD_ZERO()` macros, on macOS.
Ref: https://github.com/curl/curl/pull/17680#issuecomment-2991730158
Closes #17705
165 lines
6.1 KiB
CMake
165 lines
6.1 KiB
CMake
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
# File defines convenience macros for available feature testing
|
|
|
|
# Check if header file exists and add it to the list.
|
|
# This macro is intended to be called multiple times with a sequence of
|
|
# possibly dependent header files. Some headers depend on others to be
|
|
# compiled correctly.
|
|
macro(check_include_file_concat_curl _file _variable)
|
|
check_include_files("${CURL_INCLUDES};${_file}" ${_variable})
|
|
if(${_variable})
|
|
list(APPEND CURL_INCLUDES ${_file})
|
|
endif()
|
|
endmacro()
|
|
|
|
set(CURL_TEST_DEFINES "") # Initialize global variable
|
|
|
|
# For other curl specific tests, use this macro.
|
|
# Return result in variable: CURL_TEST_OUTPUT
|
|
macro(curl_internal_test _curl_test)
|
|
if(NOT DEFINED "${_curl_test}")
|
|
string(REPLACE ";" " " _cmake_required_definitions "${CMAKE_REQUIRED_DEFINITIONS}")
|
|
set(_curl_test_add_libraries "")
|
|
if(CMAKE_REQUIRED_LIBRARIES)
|
|
set(_curl_test_add_libraries
|
|
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
|
|
endif()
|
|
|
|
message(STATUS "Performing Test ${_curl_test}")
|
|
try_compile(${_curl_test}
|
|
${PROJECT_BINARY_DIR}
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c"
|
|
CMAKE_FLAGS
|
|
"-DCOMPILE_DEFINITIONS:STRING=-D${_curl_test} ${CURL_TEST_DEFINES} ${CMAKE_REQUIRED_FLAGS} ${_cmake_required_definitions}"
|
|
"${_curl_test_add_libraries}"
|
|
OUTPUT_VARIABLE CURL_TEST_OUTPUT)
|
|
if(${_curl_test})
|
|
set(${_curl_test} 1 CACHE INTERNAL "Curl test")
|
|
message(STATUS "Performing Test ${_curl_test} - Success")
|
|
else()
|
|
set(${_curl_test} "" CACHE INTERNAL "Curl test")
|
|
message(STATUS "Performing Test ${_curl_test} - Failed")
|
|
endif()
|
|
endif()
|
|
endmacro()
|
|
|
|
# Option for dependencies that accepts an 'AUTO' value, which enables the dependency if detected.
|
|
macro(curl_dependency_option _option_name _find_name _desc_name)
|
|
set(${_option_name} "AUTO" CACHE STRING "Build curl with ${_desc_name} support (AUTO, ON or OFF)")
|
|
set_property(CACHE ${_option_name} PROPERTY STRINGS "AUTO" "ON" "OFF")
|
|
|
|
if(${_option_name} STREQUAL "AUTO")
|
|
find_package(${_find_name})
|
|
elseif(${_option_name})
|
|
find_package(${_find_name} REQUIRED)
|
|
endif()
|
|
endmacro()
|
|
|
|
# Convert the passed paths to libpath linker options and add them to CMAKE_REQUIRED_*.
|
|
macro(curl_required_libpaths _libpaths_arg)
|
|
if(CMAKE_VERSION VERSION_LESS 3.31)
|
|
set(_libpaths "${_libpaths_arg}")
|
|
foreach(_libpath IN LISTS _libpaths)
|
|
list(APPEND CMAKE_REQUIRED_LINK_OPTIONS "${CMAKE_LIBRARY_PATH_FLAG}${_libpath}")
|
|
endforeach()
|
|
else()
|
|
list(APPEND CMAKE_REQUIRED_LINK_DIRECTORIES "${_libpaths_arg}")
|
|
endif()
|
|
endmacro()
|
|
|
|
# Pre-fill variables set by a check_type_size() call.
|
|
macro(curl_prefill_type_size _type _size)
|
|
set(HAVE_SIZEOF_${_type} TRUE)
|
|
set(SIZEOF_${_type} ${_size})
|
|
set(SIZEOF_${_type}_CODE "#define SIZEOF_${_type} ${_size}")
|
|
endmacro()
|
|
|
|
# Create a clang-tidy target for test targets
|
|
macro(curl_clang_tidy_tests _target)
|
|
if(CURL_CLANG_TIDY)
|
|
|
|
# Collect header directories and macro definitions from lib dependencies
|
|
set(_includes_l "")
|
|
set(_definitions_l "")
|
|
get_target_property(_libs ${_target} LINK_LIBRARIES)
|
|
foreach(_lib IN LISTS _libs)
|
|
if(TARGET "${_lib}")
|
|
get_target_property(_val ${_lib} INCLUDE_DIRECTORIES)
|
|
if(_val)
|
|
list(APPEND _includes_l ${_val})
|
|
endif()
|
|
get_target_property(_val ${_lib} COMPILE_DEFINITIONS)
|
|
if(_val)
|
|
list(APPEND _definitions_l ${_val})
|
|
endif()
|
|
endif()
|
|
endforeach()
|
|
|
|
# Collect header directories applying to the target
|
|
get_directory_property(_includes_d INCLUDE_DIRECTORIES)
|
|
get_target_property(_includes_t ${_target} INCLUDE_DIRECTORIES)
|
|
|
|
set(_includes "${_includes_l};${_includes_d};${_includes_t}")
|
|
list(REMOVE_ITEM _includes "")
|
|
string(REPLACE ";" ";-I" _includes ";${_includes}")
|
|
|
|
# Collect macro definitions applying to the target
|
|
get_directory_property(_definitions_d COMPILE_DEFINITIONS)
|
|
get_target_property(_definitions_t ${_target} COMPILE_DEFINITIONS)
|
|
|
|
set(_definitions "${_definitions_l};${_definitions_d};${_definitions_t}")
|
|
list(REMOVE_ITEM _definitions "")
|
|
string(REPLACE ";" ";-D" _definitions ";${_definitions}")
|
|
list(SORT _definitions) # Sort like CMake does
|
|
|
|
# Assemble source list
|
|
set(_sources "")
|
|
foreach(_source IN ITEMS ${ARGN})
|
|
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_source}") # if not in source tree
|
|
set(_source "${CMAKE_CURRENT_BINARY_DIR}/${_source}") # look in the build tree, for generated files, e.g. lib1521.c
|
|
endif()
|
|
list(APPEND _sources "${_source}")
|
|
endforeach()
|
|
|
|
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")
|
|
|
|
unset(_includes_d)
|
|
unset(_includes_t)
|
|
unset(_includes)
|
|
unset(_definitions_l)
|
|
unset(_definitions_d)
|
|
unset(_definitions_t)
|
|
unset(_definitions)
|
|
unset(_sources)
|
|
unset(_source)
|
|
unset(_libs)
|
|
unset(_lib)
|
|
unset(_val)
|
|
endif()
|
|
endmacro()
|