diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-06-04 12:39:44 +0300 |
---|---|---|
committer | shadchin <shadchin@yandex-team.ru> | 2022-06-04 12:39:44 +0300 |
commit | 54d117cd856f523f73568e4e162eff1a31e635ab (patch) | |
tree | 17b796436a7bc713f187ee75fba38e6213424943 | |
parent | d0b36241bc1aab45c3239df3bd6f11df9bb5b1d4 (diff) | |
download | ydb-54d117cd856f523f73568e4e162eff1a31e635ab.tar.gz |
DTCC-1012 Fix missing recurses
ref:e1d2fef3c835f90cca8a51c3e922bf3646789edb
-rw-r--r-- | CMakeLists.darwin.txt | 6 | ||||
-rw-r--r-- | CMakeLists.linux.txt | 6 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt | 32 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt | 35 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt | 13 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt | 29 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt | 32 | ||||
-rw-r--r-- | ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt | 13 | ||||
-rw-r--r-- | ydb/core/tx/datashard/datashard_ut_common_kqp.cpp | 1 | ||||
-rw-r--r-- | ydb/core/ymq/actor/ut/CMakeLists.darwin.txt | 52 | ||||
-rw-r--r-- | ydb/core/ymq/actor/ut/CMakeLists.linux.txt | 55 | ||||
-rw-r--r-- | ydb/core/ymq/actor/ut/CMakeLists.txt | 13 | ||||
-rw-r--r-- | ydb/core/ymq/base/ut/CMakeLists.darwin.txt | 46 | ||||
-rw-r--r-- | ydb/core/ymq/base/ut/CMakeLists.linux.txt | 49 | ||||
-rw-r--r-- | ydb/core/ymq/base/ut/CMakeLists.txt | 13 |
15 files changed, 392 insertions, 3 deletions
diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt index 526e6e77beb..a98538a6d61 100644 --- a/CMakeLists.darwin.txt +++ b/CMakeLists.darwin.txt @@ -989,7 +989,6 @@ add_subdirectory(ydb/core/viewer/ut) add_subdirectory(ydb/core/wrappers/ut) add_subdirectory(ydb/core/ydb_convert/ut) add_subdirectory(ydb/core/ymq/ut) -add_subdirectory(ydb/core/ymq/actor/yc_search_ut) add_subdirectory(ydb/library/aclib/ut) add_subdirectory(ydb/library/backup/ut) add_subdirectory(ydb/library/binary_json/ut) @@ -1169,6 +1168,9 @@ add_subdirectory(ydb/core/testlib/actors/ut) add_subdirectory(ydb/core/kesus/proxy/ut) add_subdirectory(ydb/core/kesus/tablet/ut) add_subdirectory(ydb/core/kesus/tablet/quoter_performance_test) +add_subdirectory(ydb/core/ymq/actor/ut) +add_subdirectory(ydb/core/ymq/actor/yc_search_ut) +add_subdirectory(ydb/core/ymq/base/ut) add_subdirectory(ydb/core/ymq/client/bin) add_subdirectory(ydb/core/ymq/client/cpp) add_subdirectory(ydb/core/driver_lib/run/ut) @@ -1200,6 +1202,8 @@ add_subdirectory(ydb/public/sdk/cpp/client/ydb_params/ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_coordination/ut) add_subdirectory(ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut) add_subdirectory(ydb/public/sdk/cpp/client/draft/ut) +add_subdirectory(ydb/core/tablet_flat/test/tool/surg) +add_subdirectory(ydb/core/tablet_flat/test/tool/perf) add_subdirectory(ydb/core/tx/replication/ydb_proxy/ut) add_subdirectory(ydb/core/yq/libs/checkpointing/ut) add_subdirectory(ydb/core/yq/libs/checkpointing/events) diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt index 225a01df147..094ef252b2f 100644 --- a/CMakeLists.linux.txt +++ b/CMakeLists.linux.txt @@ -1083,7 +1083,6 @@ add_subdirectory(ydb/core/viewer/ut) add_subdirectory(ydb/core/wrappers/ut) add_subdirectory(ydb/core/ydb_convert/ut) add_subdirectory(ydb/core/ymq/ut) -add_subdirectory(ydb/core/ymq/actor/yc_search_ut) add_subdirectory(ydb/library/aclib/ut) add_subdirectory(ydb/library/backup/ut) add_subdirectory(ydb/library/binary_json/ut) @@ -1265,6 +1264,9 @@ add_subdirectory(ydb/core/testlib/actors/ut) add_subdirectory(ydb/core/kesus/proxy/ut) add_subdirectory(ydb/core/kesus/tablet/ut) add_subdirectory(ydb/core/kesus/tablet/quoter_performance_test) +add_subdirectory(ydb/core/ymq/actor/ut) +add_subdirectory(ydb/core/ymq/actor/yc_search_ut) +add_subdirectory(ydb/core/ymq/base/ut) add_subdirectory(ydb/core/ymq/client/bin) add_subdirectory(ydb/core/ymq/client/cpp) add_subdirectory(ydb/core/driver_lib/run/ut) @@ -1296,6 +1298,8 @@ add_subdirectory(ydb/public/sdk/cpp/client/ydb_params/ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_coordination/ut) add_subdirectory(ydb/public/sdk/cpp/client/impl/ydb_endpoints/ut) add_subdirectory(ydb/public/sdk/cpp/client/draft/ut) +add_subdirectory(ydb/core/tablet_flat/test/tool/surg) +add_subdirectory(ydb/core/tablet_flat/test/tool/perf) add_subdirectory(ydb/core/tx/replication/ydb_proxy/ut) add_subdirectory(ydb/core/yq/libs/checkpointing/ut) add_subdirectory(ydb/core/yq/libs/checkpointing/events) diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt new file mode 100644 index 00000000000..5f2b5d536a4 --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.darwin.txt @@ -0,0 +1,32 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(table-perf) +target_link_libraries(table-perf PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-cpuid_check + test-libs-table + library-cpp-charset + library-cpp-getopt + ydb-core-tablet_flat +) +target_link_options(table-perf PRIVATE + -Wl,-no_deduplicate + -Wl,-sdk_version,10.15 + -fPIC + -fPIC + -framework + CoreFoundation +) +target_sources(table-perf PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/perf/colons.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/perf/main.cpp +) +vcs_info(table-perf) diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt new file mode 100644 index 00000000000..f227440a875 --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.linux.txt @@ -0,0 +1,35 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(table-perf) +target_link_libraries(table-perf PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-lfalloc + library-cpp-cpuid_check + test-libs-table + library-cpp-charset + library-cpp-getopt + ydb-core-tablet_flat +) +target_link_options(table-perf PRIVATE + -ldl + -lrt + -Wl,--no-as-needed + -fPIC + -fPIC + -lpthread + -lrt + -ldl +) +target_sources(table-perf PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/perf/colons.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/perf/main.cpp +) +vcs_info(table-perf) diff --git a/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt new file mode 100644 index 00000000000..a681d385f3e --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/perf/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (UNIX) + include(CMakeLists.linux.txt) +endif() diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt new file mode 100644 index 00000000000..05a78e6d142 --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.darwin.txt @@ -0,0 +1,29 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(surg) +target_link_libraries(surg PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-cpuid_check + library-cpp-getopt + ydb-core-tablet_flat +) +target_link_options(surg PRIVATE + -Wl,-no_deduplicate + -Wl,-sdk_version,10.15 + -fPIC + -fPIC + -framework + CoreFoundation +) +target_sources(surg PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/surg/main.cpp +) +vcs_info(surg) diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt new file mode 100644 index 00000000000..3160430e615 --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.linux.txt @@ -0,0 +1,32 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(surg) +target_link_libraries(surg PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-lfalloc + library-cpp-cpuid_check + library-cpp-getopt + ydb-core-tablet_flat +) +target_link_options(surg PRIVATE + -ldl + -lrt + -Wl,--no-as-needed + -fPIC + -fPIC + -lpthread + -lrt + -ldl +) +target_sources(surg PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/tablet_flat/test/tool/surg/main.cpp +) +vcs_info(surg) diff --git a/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt new file mode 100644 index 00000000000..a681d385f3e --- /dev/null +++ b/ydb/core/tablet_flat/test/tool/surg/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (UNIX) + include(CMakeLists.linux.txt) +endif() diff --git a/ydb/core/tx/datashard/datashard_ut_common_kqp.cpp b/ydb/core/tx/datashard/datashard_ut_common_kqp.cpp deleted file mode 100644 index f73a036d424..00000000000 --- a/ydb/core/tx/datashard/datashard_ut_common_kqp.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "datashard_ut_common_kqp.h" diff --git a/ydb/core/ymq/actor/ut/CMakeLists.darwin.txt b/ydb/core/ymq/actor/ut/CMakeLists.darwin.txt new file mode 100644 index 00000000000..2875fa1e7e2 --- /dev/null +++ b/ydb/core/ymq/actor/ut/CMakeLists.darwin.txt @@ -0,0 +1,52 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(ydb-core-ymq-actor-ut) +target_compile_options(ydb-core-ymq-actor-ut PRIVATE + -DUSE_CURRENT_UDF_ABI_VERSION +) +target_link_libraries(ydb-core-ymq-actor-ut PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-cpuid_check + cpp-testing-unittest_main + contrib-libs-yaml-cpp + core-mind-address_classification + ydb-core-testlib + core-ymq-actor + core-ymq-base + core-ymq-http +) +target_link_options(ydb-core-ymq-actor-ut PRIVATE + -Wl,-no_deduplicate + -Wl,-sdk_version,10.15 + -fPIC + -fPIC + -framework + CoreFoundation +) +target_sources(ydb-core-ymq-actor-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/infly_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/sha256_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/metering_ut.cpp +) +add_test( + NAME + ydb-core-ymq-actor-ut + COMMAND + ydb-core-ymq-actor-ut + --print-before-suite + --print-before-test + --fork-tests + --print-times + --show-fails +) +vcs_info(ydb-core-ymq-actor-ut) diff --git a/ydb/core/ymq/actor/ut/CMakeLists.linux.txt b/ydb/core/ymq/actor/ut/CMakeLists.linux.txt new file mode 100644 index 00000000000..8e50984759d --- /dev/null +++ b/ydb/core/ymq/actor/ut/CMakeLists.linux.txt @@ -0,0 +1,55 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(ydb-core-ymq-actor-ut) +target_compile_options(ydb-core-ymq-actor-ut PRIVATE + -DUSE_CURRENT_UDF_ABI_VERSION +) +target_link_libraries(ydb-core-ymq-actor-ut PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-lfalloc + library-cpp-cpuid_check + cpp-testing-unittest_main + contrib-libs-yaml-cpp + core-mind-address_classification + ydb-core-testlib + core-ymq-actor + core-ymq-base + core-ymq-http +) +target_link_options(ydb-core-ymq-actor-ut PRIVATE + -ldl + -lrt + -Wl,--no-as-needed + -fPIC + -fPIC + -lpthread + -lrt + -ldl +) +target_sources(ydb-core-ymq-actor-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/attributes_md5_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/infly_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/message_delay_stats_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/sha256_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/actor/ut/metering_ut.cpp +) +add_test( + NAME + ydb-core-ymq-actor-ut + COMMAND + ydb-core-ymq-actor-ut + --print-before-suite + --print-before-test + --fork-tests + --print-times + --show-fails +) +vcs_info(ydb-core-ymq-actor-ut) diff --git a/ydb/core/ymq/actor/ut/CMakeLists.txt b/ydb/core/ymq/actor/ut/CMakeLists.txt new file mode 100644 index 00000000000..a681d385f3e --- /dev/null +++ b/ydb/core/ymq/actor/ut/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (UNIX) + include(CMakeLists.linux.txt) +endif() diff --git a/ydb/core/ymq/base/ut/CMakeLists.darwin.txt b/ydb/core/ymq/base/ut/CMakeLists.darwin.txt new file mode 100644 index 00000000000..e90ab70740a --- /dev/null +++ b/ydb/core/ymq/base/ut/CMakeLists.darwin.txt @@ -0,0 +1,46 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(ydb-core-ymq-base-ut) +target_link_libraries(ydb-core-ymq-base-ut PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-cpuid_check + cpp-testing-unittest_main + ydb-core-base + core-ymq-base +) +target_link_options(ydb-core-ymq-base-ut PRIVATE + -Wl,-no_deduplicate + -Wl,-sdk_version,10.15 + -fPIC + -fPIC + -framework + CoreFoundation +) +target_sources(ydb-core-ymq-base-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/action_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/counters_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/helpers_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/queue_attributes_ut.cpp +) +add_test( + NAME + ydb-core-ymq-base-ut + COMMAND + ydb-core-ymq-base-ut + --print-before-suite + --print-before-test + --fork-tests + --print-times + --show-fails +) +vcs_info(ydb-core-ymq-base-ut) diff --git a/ydb/core/ymq/base/ut/CMakeLists.linux.txt b/ydb/core/ymq/base/ut/CMakeLists.linux.txt new file mode 100644 index 00000000000..5a144fe399e --- /dev/null +++ b/ydb/core/ymq/base/ut/CMakeLists.linux.txt @@ -0,0 +1,49 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + + +add_executable(ydb-core-ymq-base-ut) +target_link_libraries(ydb-core-ymq-base-ut PUBLIC + contrib-libs-cxxsupp + yutil + library-cpp-lfalloc + library-cpp-cpuid_check + cpp-testing-unittest_main + ydb-core-base + core-ymq-base +) +target_link_options(ydb-core-ymq-base-ut PRIVATE + -ldl + -lrt + -Wl,--no-as-needed + -fPIC + -fPIC + -lpthread + -lrt + -ldl +) +target_sources(ydb-core-ymq-base-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/action_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/counters_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/dlq_helpers_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/helpers_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/secure_protobuf_printer_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/ymq/base/ut/queue_attributes_ut.cpp +) +add_test( + NAME + ydb-core-ymq-base-ut + COMMAND + ydb-core-ymq-base-ut + --print-before-suite + --print-before-test + --fork-tests + --print-times + --show-fails +) +vcs_info(ydb-core-ymq-base-ut) diff --git a/ydb/core/ymq/base/ut/CMakeLists.txt b/ydb/core/ymq/base/ut/CMakeLists.txt new file mode 100644 index 00000000000..a681d385f3e --- /dev/null +++ b/ydb/core/ymq/base/ut/CMakeLists.txt @@ -0,0 +1,13 @@ + +# This file was gererated by the build system used internally in the Yandex monorepo. +# Only simple modifications are allowed (adding source-files to targets, adding simple properties +# like target_include_directories). These modifications will be ported to original +# ya.make files by maintainers. Any complex modifications which can't be ported back to the +# original buildsystem will not be accepted. + + +if (APPLE) + include(CMakeLists.darwin.txt) +elseif (UNIX) + include(CMakeLists.linux.txt) +endif() |