diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-05-15 05:41:44 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-05-15 05:54:27 +0300 |
| commit | 44e3c064f0f00136dac296f10fd91b51ae3893ff (patch) | |
| tree | 6aad45dfc457c638f3cc22a5a2572a4c5b5f741f | |
| parent | ab9c5839c287b41788f520f1d7c9a19017136763 (diff) | |
| download | ydb-44e3c064f0f00136dac296f10fd91b51ae3893ff.tar.gz | |
fix CLANG_TYDY for GTEST
539f9fa5134a084cd4e71512b2f08cc257bf4426
| -rw-r--r-- | build/ymake.core.conf | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index a22b39b5a5a..ea6ae5043b4 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1115,12 +1115,20 @@ module _LINK_UNIT: _BASE_UNIT { } ENABLE(COMMON_LINK_SETTINGS) CHECK_PROVIDES() + + ADD_CLANG_TIDY() + when ($TIDY_ENABLED == "yes") { + MODULE_PREFIX= + MODULE_SUFFIX=.tidyjson + _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json + _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json + } } MODULE_TYPE=UNKNOWN macro ADD_CLANG_TIDY() { - ADD_YTEST($MODULE_PREFIX$REALPRJNAME clang_tidy) + ADD_YTEST($MODULE_PREFIX$REALPRJNAME$MODULE_SUFFIX clang_tidy) } # tag:internal @@ -1143,10 +1151,6 @@ module _BASE_PROGRAM: _LINK_UNIT { MODULE_SUFFIX=.exe } - when ($TIDY_ENABLED == "yes") { - MODULE_SUFFIX=.tidyjson - } - when ($MSVC != "yes" && $NOPLATFORM != "yes" && $WITH_VALGRIND != "yes" && $USE_ASMLIB != "no" && $MIC_ARCH != "yes" && $PIC != "yes" && $PIE != "yes") { when ($OS_LINUX == "yes" && $ARCH_X86_64 == "yes" && $MUSL != "yes" && $SANITIZER_DEFINED != "yes" && $USE_THINLTO != "yes") { PEERDIR+=contrib/libs/glibcasm @@ -1230,13 +1234,6 @@ module PROGRAM: _BASE_PROGRAM { ADD_YTEST($MODULE_PREFIX$REALPRJNAME coverage.extractor) - ADD_CLANG_TIDY() - - when ($TIDY_ENABLED == "yes") { - _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json - _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json - } - _DONT_REQUIRE_LICENSE() } @@ -1807,15 +1804,13 @@ module _LIBRARY: _BASE_UNIT { MODULE_PREFIX= MODULE_SUFFIX=.lib } + elsewhen ($TIDY_ENABLED == "yes") { + MODULE_PREFIX= + MODULE_SUFFIX=.tidyjson + } otherwise { - when ($TIDY_ENABLED == "yes") { - MODULE_PREFIX= - MODULE_SUFFIX=.tidyjson - } - otherwise { - MODULE_PREFIX=lib - MODULE_SUFFIX=.a - } + MODULE_PREFIX=lib + MODULE_SUFFIX=.a } when ($WERROR != "no") { @@ -2095,12 +2090,6 @@ module DLL_UNIT: _LINK_UNIT { SET(MODULE_TAG DLL) SET(MODULE_LANG CPP) - ADD_CLANG_TIDY() - when ($TIDY_ENABLED == "yes") { - _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json - _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json - } - when ($EXPORTS_FILE) { _EXPORT_SCRIPT_SEM=&& use_export_script ${input:EXPORTS_FILE} } @@ -2112,11 +2101,7 @@ module DLL_UNIT: _LINK_UNIT { MODULE_PREFIX=lib MODULE_SUFFIX=.dylib } - elsewhen ($TIDY_ENABLED == "yes") { - MODULE_PREFIX= - MODULE_SUFFIX=.tidyjson - } - otherwise { + elsewhen ($TIDY_ENABLED != "yes") { MODULE_PREFIX=lib MODULE_SUFFIX=.so } |