From d6e56ae4b5075e7a8ab080c00c62d15ca498910c Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110.@qq.com> Date: Sat, 2 Sep 2023 07:45:55 -0700 Subject: [PATCH] Clang-tidy test. --- build/global_config.cmake | 2 +- utils/LogC/CMakeLists.txt | 21 +++++++++++++++++++++ utils/LogC/abstract/iLog.c | 2 +- utils/LogC/include/iLog.h | 8 ++++---- utils/LogC/src/logMakePtr.c | 4 +++- utils/LogC/src/logMakePtr.h | 6 +++--- utils/LogC/src/logUb.c | 9 +++++---- 7 files changed, 38 insertions(+), 14 deletions(-) diff --git a/build/global_config.cmake b/build/global_config.cmake index 065810c9..281fae9c 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -12,7 +12,7 @@ set(HAL_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/hal") set(TEST_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/test") set(EXTERNAL_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/external") -set(CLANG_TIDY_CHECKS "-*\ +set(CLANG_TIDY_CHECKS "-*,\ llvm-else-after-return,\ llvm-header-guard,\ llvm-include-order,\ diff --git a/utils/LogC/CMakeLists.txt b/utils/LogC/CMakeLists.txt index fc01703d..4e8b4a9f 100644 --- a/utils/LogC/CMakeLists.txt +++ b/utils/LogC/CMakeLists.txt @@ -26,3 +26,24 @@ add_library(${ABSTRACT_TARGET} STATIC ${ABSTRACT_FILES}) target_link_libraries(${ABSTRACT_TARGET} ReturnCode) add_library(${IMPL_TARGET} STATIC ${IMPL_SRC_FILES}) target_link_libraries(${IMPL_TARGET} ${ABSTRACT_TARGET} ReturnCode) + +add_custom_target( + log_code_check + COMMAND ${CMAKE_SOURCE_DIR_IPCSDK}/tools/clang-tidy/clang-tidy + -checks='${CLANG_TIDY_CHECKS}' + ${IMPL_SRC_FILES} + ${ABSTRACT_FILES} + ${CLANG_TIDY_CONFIG} + -header-filter=.* + -system-headers=false + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/utils/LogC +) + +# add_custom_command( +# TARGET ${IMPL_TARGET} +# TARGET ${ABSTRACT_TARGET} +# PRE_BUILD +# COMMAND make log_code_check +# WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ +# ) \ No newline at end of file diff --git a/utils/LogC/abstract/iLog.c b/utils/LogC/abstract/iLog.c index 6d1397b2..ec5a6fef 100644 --- a/utils/LogC/abstract/iLog.c +++ b/utils/LogC/abstract/iLog.c @@ -1,5 +1,5 @@ #include "iLog.h" - +#include "ReturnCode.h" #include #include diff --git a/utils/LogC/include/iLog.h b/utils/LogC/include/iLog.h index eff20e88..9664922e 100644 --- a/utils/LogC/include/iLog.h +++ b/utils/LogC/include/iLog.h @@ -1,7 +1,7 @@ -#ifndef _IPC_I_LOG_H_ -#define _IPC_I_LOG_H_ +#ifndef ILOG_H +#define ILOG_H -#include +// #include #include #include "ReturnCode.h" @@ -62,4 +62,4 @@ RETURN_CODE_C destroy_log_module(void); } #endif -#endif //_IPC_I_LOG_H_ \ No newline at end of file +#endif //ILOG_H \ No newline at end of file diff --git a/utils/LogC/src/logMakePtr.c b/utils/LogC/src/logMakePtr.c index 5e3ac22e..1498b134 100644 --- a/utils/LogC/src/logMakePtr.c +++ b/utils/LogC/src/logMakePtr.c @@ -1,8 +1,10 @@ #include "logMakePtr.h" +#include "ReturnCode.h" +#include "iLog.h" #include "logUb.h" #include #include -#include +// #include RETURN_CODE_C create_log_module(void) { LogUbuntu *log = NULL; diff --git a/utils/LogC/src/logMakePtr.h b/utils/LogC/src/logMakePtr.h index d243774e..94474e56 100644 --- a/utils/LogC/src/logMakePtr.h +++ b/utils/LogC/src/logMakePtr.h @@ -1,5 +1,5 @@ -#ifndef _IPC_LOG_MAKE_PTR_H_ -#define _IPC_LOG_MAKE_PTR_H_ +#ifndef LOGMAKEPTR_H +#define LOGMAKEPTR_H #include "ReturnCode.h" #include "logUb.h" @@ -39,4 +39,4 @@ static inline RETURN_CODE_C create_log_instance(LogUbuntu **log) } #endif -#endif //_IPC_LOG_MAKE_PTR_H_ \ No newline at end of file +#endif //LOGMAKEPTR_H \ No newline at end of file diff --git a/utils/LogC/src/logUb.c b/utils/LogC/src/logUb.c index 4c685271..bb34da26 100644 --- a/utils/LogC/src/logUb.c +++ b/utils/LogC/src/logUb.c @@ -1,8 +1,9 @@ +#include "iLog.h" +#include "ReturnCode.h" #include "logUb.h" - +#include #include #include -#include #include static const char *LogLevelStr[] = { @@ -44,12 +45,12 @@ static void ub_log_fmt(ILog *log, const LogLeveL level, const char *fmt, ...) va_end(args); } -RETURN_CODE_C ub_log_init(ILog *impl) +static RETURN_CODE_C ub_log_init(ILog *impl) { return CreateReturnCode(C_RETURN_CODE_OK); } -RETURN_CODE_C ub_log_unInit(ILog *impl) +static RETURN_CODE_C ub_log_unInit(ILog *impl) { return CreateReturnCode(C_RETURN_CODE_OK); }