From e87860e00e5dcb01e378b0a546446a196a556b86 Mon Sep 17 00:00:00 2001 From: Bulat Date: Fri, 5 Apr 2024 23:29:08 +0300 Subject: [PATCH] Fixed SDK tests without pq and topic tests (#127) --- .github/actions/build/action.yaml | 2 +- .github/workflows/pr_check.yaml | 9 +- .gitignore | 15 -- CMakeLists.txt | 3 +- README.md | 9 +- client/draft/CMakeLists.txt | 2 - client/draft/ut/CMakeLists.darwin-arm64.txt | 72 --------- client/draft/ut/CMakeLists.darwin-x86_64.txt | 73 --------- client/draft/ut/CMakeLists.linux-aarch64.txt | 76 ---------- client/draft/ut/CMakeLists.linux-x86_64.txt | 78 ---------- client/draft/ut/CMakeLists.txt | 19 --- client/draft/ut/CMakeLists.windows-x86_64.txt | 66 -------- client/draft/ut/ya.make | 18 --- .../discovery_mutator/CMakeLists.txt | 2 - .../ut/CMakeLists.darwin-arm64.txt | 73 --------- .../ut/CMakeLists.darwin-x86_64.txt | 74 --------- .../ut/CMakeLists.linux-aarch64.txt | 77 ---------- .../ut/CMakeLists.linux-x86_64.txt | 79 ---------- .../discovery_mutator/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 67 -------- .../extensions/discovery_mutator/ut/ya.make | 22 --- client/impl/ydb_endpoints/CMakeLists.txt | 2 - .../ut/CMakeLists.darwin-arm64.txt | 72 --------- .../ut/CMakeLists.darwin-x86_64.txt | 73 --------- .../ut/CMakeLists.linux-aarch64.txt | 76 ---------- .../ut/CMakeLists.linux-x86_64.txt | 78 ---------- client/impl/ydb_endpoints/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 66 -------- client/impl/ydb_endpoints/ut/ya.make | 18 --- client/ydb_coordination/CMakeLists.txt | 3 - .../ut/CMakeLists.darwin-arm64.txt | 73 --------- .../ut/CMakeLists.darwin-x86_64.txt | 74 --------- .../ut/CMakeLists.linux-aarch64.txt | 77 ---------- .../ut/CMakeLists.linux-x86_64.txt | 79 ---------- client/ydb_coordination/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 67 -------- client/ydb_coordination/ut/ya.make | 22 --- client/ydb_driver/CMakeLists.txt | 2 - .../ydb_driver/ut/CMakeLists.darwin-arm64.txt | 73 --------- .../ut/CMakeLists.darwin-x86_64.txt | 74 --------- .../ut/CMakeLists.linux-aarch64.txt | 77 ---------- .../ydb_driver/ut/CMakeLists.linux-x86_64.txt | 79 ---------- client/ydb_driver/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 67 -------- client/ydb_driver/ut/ya.make | 22 --- client/ydb_params/CMakeLists.txt | 2 - .../ydb_params/ut/CMakeLists.darwin-arm64.txt | 73 --------- .../ut/CMakeLists.darwin-x86_64.txt | 74 --------- .../ut/CMakeLists.linux-aarch64.txt | 77 ---------- .../ydb_params/ut/CMakeLists.linux-x86_64.txt | 79 ---------- client/ydb_params/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 67 -------- client/ydb_params/ut/ya.make | 22 --- .../ut/compress_executor_ut.cpp | 2 +- .../ydb_persqueue_core/ut/compression_ut.cpp | 2 +- .../ydb_persqueue_core/ut/read_session_ut.cpp | 2 +- .../ydb_persqueue_core/ut/ut_utils/ut_utils.h | 2 +- client/ydb_result/CMakeLists.txt | 5 +- .../ydb_result/ut/CMakeLists.darwin-arm64.txt | 73 --------- .../ut/CMakeLists.darwin-x86_64.txt | 74 --------- .../ut/CMakeLists.linux-aarch64.txt | 77 ---------- .../ydb_result/ut/CMakeLists.linux-x86_64.txt | 79 ---------- client/ydb_result/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 67 -------- client/ydb_result/ut/ya.make | 22 --- client/ydb_table/impl/table_client.cpp | 2 +- client/ydb_value/CMakeLists.txt | 2 - .../ydb_value/ut/CMakeLists.darwin-arm64.txt | 75 --------- .../ydb_value/ut/CMakeLists.darwin-x86_64.txt | 76 ---------- .../ydb_value/ut/CMakeLists.linux-aarch64.txt | 79 ---------- .../ydb_value/ut/CMakeLists.linux-x86_64.txt | 81 ---------- client/ydb_value/ut/CMakeLists.txt | 19 --- .../ut/CMakeLists.windows-x86_64.txt | 69 --------- client/ydb_value/ut/ya.make | 24 --- cmake/common.cmake | 59 -------- cmake/testing.cmake | 143 ++++++++++++++++++ library/cpp/dbg_output/engine.cpp | 2 +- library/cpp/dbg_output/engine.h | 2 +- library/cpp/yt/memory/CMakeLists.txt | 1 - tests/CMakeLists.txt | 1 + tests/client/CMakeLists.txt | 95 ++++++++++++ .../client}/coordination_ut.cpp | 0 .../client}/discovery_mutator_ut.cpp | 0 .../ydb_driver => tests/client}/driver_ut.cpp | 0 .../client}/endpoints_ut.cpp | 0 .../ydb_params => tests/client}/params_ut.cpp | 0 .../ydb_result => tests/client}/result_ut.cpp | 0 .../ydb_value => tests/client}/value_ut.cpp | 30 ++-- .../ydb_scripting_response_headers_ut.cpp | 2 +- util/stream/output.cpp | 5 + ydb/public/lib/json_value/CMakeLists.txt | 21 +-- 91 files changed, 295 insertions(+), 3416 deletions(-) delete mode 100644 client/draft/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/draft/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/draft/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/draft/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/draft/ut/CMakeLists.txt delete mode 100644 client/draft/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/draft/ut/ya.make delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.txt delete mode 100644 client/extensions/discovery_mutator/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/extensions/discovery_mutator/ut/ya.make delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.txt delete mode 100644 client/impl/ydb_endpoints/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/impl/ydb_endpoints/ut/ya.make delete mode 100644 client/ydb_coordination/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/ydb_coordination/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/ydb_coordination/ut/CMakeLists.txt delete mode 100644 client/ydb_coordination/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/ydb_coordination/ut/ya.make delete mode 100644 client/ydb_driver/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/ydb_driver/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/ydb_driver/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/ydb_driver/ut/CMakeLists.txt delete mode 100644 client/ydb_driver/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/ydb_driver/ut/ya.make delete mode 100644 client/ydb_params/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/ydb_params/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/ydb_params/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/ydb_params/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/ydb_params/ut/CMakeLists.txt delete mode 100644 client/ydb_params/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/ydb_params/ut/ya.make delete mode 100644 client/ydb_result/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/ydb_result/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/ydb_result/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/ydb_result/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/ydb_result/ut/CMakeLists.txt delete mode 100644 client/ydb_result/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/ydb_result/ut/ya.make delete mode 100644 client/ydb_value/ut/CMakeLists.darwin-arm64.txt delete mode 100644 client/ydb_value/ut/CMakeLists.darwin-x86_64.txt delete mode 100644 client/ydb_value/ut/CMakeLists.linux-aarch64.txt delete mode 100644 client/ydb_value/ut/CMakeLists.linux-x86_64.txt delete mode 100644 client/ydb_value/ut/CMakeLists.txt delete mode 100644 client/ydb_value/ut/CMakeLists.windows-x86_64.txt delete mode 100644 client/ydb_value/ut/ya.make create mode 100644 cmake/testing.cmake create mode 100644 tests/CMakeLists.txt create mode 100644 tests/client/CMakeLists.txt rename {client/ydb_coordination => tests/client}/coordination_ut.cpp (100%) rename {client/extensions/discovery_mutator => tests/client}/discovery_mutator_ut.cpp (100%) rename {client/ydb_driver => tests/client}/driver_ut.cpp (100%) rename {client/impl/ydb_endpoints => tests/client}/endpoints_ut.cpp (100%) rename {client/ydb_params => tests/client}/params_ut.cpp (100%) rename {client/ydb_result => tests/client}/result_ut.cpp (100%) rename {client/ydb_value => tests/client}/value_ut.cpp (97%) rename {client/draft => tests/client}/ydb_scripting_response_headers_ut.cpp (97%) diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml index 7e2ee7d5199..841d21c0456 100644 --- a/.github/actions/build/action.yaml +++ b/.github/actions/build/action.yaml @@ -21,5 +21,5 @@ runs: cd ../build export CCACHE_BASEDIR=`realpath ..` export CCACHE_DIR=~/.ccache - ninja + ninja -j32 ccache -s diff --git a/.github/workflows/pr_check.yaml b/.github/workflows/pr_check.yaml index 7983904ae14..0a8b51eb922 100644 --- a/.github/workflows/pr_check.yaml +++ b/.github/workflows/pr_check.yaml @@ -7,7 +7,9 @@ on: pull_request: branches: - main - +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + cancel-in-progress: true jobs: main: name: PR check for YDB C++ SDK @@ -55,6 +57,11 @@ jobs: ubuntu-22.04-ccache- - name: Build uses: ./.github/actions/build + - name: Test + shell: bash + run: | + cd ../build/tests + ctest -j32 --timeout 1200 --output-on-failure - name: Launch basic example shell: bash run: | diff --git a/.gitignore b/.gitignore index e5d34760c2d..3b9618ac4ea 100644 --- a/.gitignore +++ b/.gitignore @@ -55,21 +55,6 @@ __pycache__/ *.kdev4 # Other symlinks -contrib/python/protobuf/py3/google.protobuf.internal._api_implementation.reg3.cpp -contrib/python/protobuf/py3/google.protobuf.pyext._message.reg3.cpp -contrib/tools/python3/src/Modules/_sqlite/_sqlite3.reg3.cpp -contrib/tools/ragel6/all_cd.cpp -contrib/tools/ragel6/all_cs.cpp -contrib/tools/ragel6/all_fs.cpp -contrib/tools/ragel6/all_go.cpp -contrib/tools/ragel6/all_ml.cpp -contrib/tools/ragel6/all_other.cpp -contrib/tools/ragel6/all_r.cpp -library/python/runtime_py3/__res.pyx.cpp -library/python/runtime_py3/__res.reg3.cpp -library/python/runtime_py3/sitecustomize.pyx.cpp -library/python/runtime_py3/sitecustomize.reg3.cpp -library/python/symbols/module/library.python.symbols.module.syms.reg3.cpp util/all_datetime.cpp util/all_digest.cpp util/all_folder.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e4aed891454..b694cddf1dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,8 @@ include(cmake/common.cmake) include(cmake/global_flags.cmake) include(cmake/protobuf.cmake) include(cmake/global_vars.cmake) - include(cmake/external_libs.cmake) +include(cmake/testing.cmake) add_subdirectory(tools) add_subdirectory(contrib) @@ -32,3 +32,4 @@ add_subdirectory(util) add_subdirectory(ydb) add_subdirectory(client) add_subdirectory(examples) +add_subdirectory(tests) diff --git a/README.md b/README.md index 5b363abd9e7..ab1f8d8f5b5 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ If you ok with this warning, then... - libidn11-dev (IDN) - libiconv (Iconv) -## Testing +## Testing requirements - gtest - gmock @@ -114,3 +114,10 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ cd build ninja ``` + +## Test + +```bash +cd ../build/tests +ctest -j32 --timeout 1200 --output-on-failure +``` diff --git a/client/draft/CMakeLists.txt b/client/draft/CMakeLists.txt index c0ceb6408f6..fd5f0d02857 100644 --- a/client/draft/CMakeLists.txt +++ b/client/draft/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(cpp-client-draft) target_link_libraries(cpp-client-draft PUBLIC diff --git a/client/draft/ut/CMakeLists.darwin-arm64.txt b/client/draft/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 1e0ec96c4c2..00000000000 --- a/client/draft/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,72 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-draft-ut) -target_include_directories(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft -) -target_link_libraries(ydb-public-sdk-cpp-client-draft-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-draft -) -target_link_options(ydb-public-sdk-cpp-client-draft-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft/ydb_scripting_response_headers_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-draft-ut - TEST_TARGET - ydb-public-sdk-cpp-client-draft-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-draft-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-draft-ut) diff --git a/client/draft/ut/CMakeLists.darwin-x86_64.txt b/client/draft/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 38331ea7260..00000000000 --- a/client/draft/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-draft-ut) -target_include_directories(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft -) -target_link_libraries(ydb-public-sdk-cpp-client-draft-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-draft -) -target_link_options(ydb-public-sdk-cpp-client-draft-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft/ydb_scripting_response_headers_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-draft-ut - TEST_TARGET - ydb-public-sdk-cpp-client-draft-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-draft-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-draft-ut) diff --git a/client/draft/ut/CMakeLists.linux-aarch64.txt b/client/draft/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index b893b239a27..00000000000 --- a/client/draft/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,76 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-draft-ut) -target_include_directories(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft -) -target_link_libraries(ydb-public-sdk-cpp-client-draft-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-draft -) -target_link_options(ydb-public-sdk-cpp-client-draft-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft/ydb_scripting_response_headers_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-draft-ut - TEST_TARGET - ydb-public-sdk-cpp-client-draft-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-draft-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-draft-ut) diff --git a/client/draft/ut/CMakeLists.linux-x86_64.txt b/client/draft/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index ea7da46e19e..00000000000 --- a/client/draft/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,78 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-draft-ut) -target_include_directories(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft -) -target_link_libraries(ydb-public-sdk-cpp-client-draft-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-draft -) -target_link_options(ydb-public-sdk-cpp-client-draft-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft/ydb_scripting_response_headers_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-draft-ut - TEST_TARGET - ydb-public-sdk-cpp-client-draft-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-draft-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-draft-ut) diff --git a/client/draft/ut/CMakeLists.txt b/client/draft/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/draft/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/draft/ut/CMakeLists.windows-x86_64.txt b/client/draft/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 009d09b0358..00000000000 --- a/client/draft/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,66 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-draft-ut) -target_include_directories(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft -) -target_link_libraries(ydb-public-sdk-cpp-client-draft-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-draft -) -target_sources(ydb-public-sdk-cpp-client-draft-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/draft/ydb_scripting_response_headers_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-draft-ut - TEST_TARGET - ydb-public-sdk-cpp-client-draft-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-draft-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-draft-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-draft-ut) diff --git a/client/draft/ut/ya.make b/client/draft/ut/ya.make deleted file mode 100644 index 61d5121de6c..00000000000 --- a/client/draft/ut/ya.make +++ /dev/null @@ -1,18 +0,0 @@ -UNITTEST_FOR(client/draft) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -SRCS( - ydb_scripting_response_headers_ut.cpp -) - -END() diff --git a/client/extensions/discovery_mutator/CMakeLists.txt b/client/extensions/discovery_mutator/CMakeLists.txt index 17dd2e0181f..d48afb6d6da 100644 --- a/client/extensions/discovery_mutator/CMakeLists.txt +++ b/client/extensions/discovery_mutator/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(client-extensions-discovery_mutator) target_link_libraries(client-extensions-discovery_mutator PUBLIC diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.darwin-arm64.txt b/client/extensions/discovery_mutator/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 82c7ef3db10..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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(client-extensions-discovery_mutator-ut) -target_include_directories(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator -) -target_link_libraries(client-extensions-discovery_mutator-ut PUBLIC - yutil - cpp-testing-unittest_main - client-extensions-discovery_mutator - cpp-client-ydb_table -) -target_link_options(client-extensions-discovery_mutator-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator_ut.cpp -) -set_property( - TARGET - client-extensions-discovery_mutator-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - client-extensions-discovery_mutator-ut - TEST_TARGET - client-extensions-discovery_mutator-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(client-extensions-discovery_mutator-ut - system_allocator -) -vcs_info(client-extensions-discovery_mutator-ut) diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt b/client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index b16159b84aa..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,74 +0,0 @@ - -# This file was generated 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(client-extensions-discovery_mutator-ut) -target_include_directories(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator -) -target_link_libraries(client-extensions-discovery_mutator-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-extensions-discovery_mutator - cpp-client-ydb_table -) -target_link_options(client-extensions-discovery_mutator-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator_ut.cpp -) -set_property( - TARGET - client-extensions-discovery_mutator-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - client-extensions-discovery_mutator-ut - TEST_TARGET - client-extensions-discovery_mutator-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(client-extensions-discovery_mutator-ut - system_allocator -) -vcs_info(client-extensions-discovery_mutator-ut) diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.linux-aarch64.txt b/client/extensions/discovery_mutator/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 276bead3f68..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,77 +0,0 @@ - -# This file was generated 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(client-extensions-discovery_mutator-ut) -target_include_directories(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator -) -target_link_libraries(client-extensions-discovery_mutator-ut PUBLIC - - yutil - cpp-testing-unittest_main - client-extensions-discovery_mutator - cpp-client-ydb_table -) -target_link_options(client-extensions-discovery_mutator-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator_ut.cpp -) -set_property( - TARGET - client-extensions-discovery_mutator-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - client-extensions-discovery_mutator-ut - TEST_TARGET - client-extensions-discovery_mutator-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(client-extensions-discovery_mutator-ut - cpp-malloc-jemalloc -) -vcs_info(client-extensions-discovery_mutator-ut) diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt b/client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index c7e44e9f9d1..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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(client-extensions-discovery_mutator-ut) -target_include_directories(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator -) -target_link_libraries(client-extensions-discovery_mutator-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-extensions-discovery_mutator - cpp-client-ydb_table -) -target_link_options(client-extensions-discovery_mutator-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator_ut.cpp -) -set_property( - TARGET - client-extensions-discovery_mutator-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - client-extensions-discovery_mutator-ut - TEST_TARGET - client-extensions-discovery_mutator-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(client-extensions-discovery_mutator-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(client-extensions-discovery_mutator-ut) diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.txt b/client/extensions/discovery_mutator/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/extensions/discovery_mutator/ut/CMakeLists.windows-x86_64.txt b/client/extensions/discovery_mutator/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index b5af691625a..00000000000 --- a/client/extensions/discovery_mutator/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,67 +0,0 @@ - -# This file was generated 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(client-extensions-discovery_mutator-ut) -target_include_directories(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator -) -target_link_libraries(client-extensions-discovery_mutator-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-extensions-discovery_mutator - cpp-client-ydb_table -) -target_sources(client-extensions-discovery_mutator-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator/discovery_mutator_ut.cpp -) -set_property( - TARGET - client-extensions-discovery_mutator-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - client-extensions-discovery_mutator-ut - TEST_TARGET - client-extensions-discovery_mutator-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - client-extensions-discovery_mutator-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(client-extensions-discovery_mutator-ut - system_allocator -) -vcs_info(client-extensions-discovery_mutator-ut) diff --git a/client/extensions/discovery_mutator/ut/ya.make b/client/extensions/discovery_mutator/ut/ya.make deleted file mode 100644 index 052acabcb90..00000000000 --- a/client/extensions/discovery_mutator/ut/ya.make +++ /dev/null @@ -1,22 +0,0 @@ -UNITTEST_FOR(client/extensions/discovery_mutator) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -PEERDIR( - client/ydb_table -) - -SRCS( - discovery_mutator_ut.cpp -) - -END() diff --git a/client/impl/ydb_endpoints/CMakeLists.txt b/client/impl/ydb_endpoints/CMakeLists.txt index 68f392703bf..db54672419f 100644 --- a/client/impl/ydb_endpoints/CMakeLists.txt +++ b/client/impl/ydb_endpoints/CMakeLists.txt @@ -1,5 +1,3 @@ -#add_subdirectory(ut) - add_library(client-impl-ydb_endpoints) target_link_libraries(client-impl-ydb_endpoints PUBLIC diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.darwin-arm64.txt b/client/impl/ydb_endpoints/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index ce457bc0749..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,72 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-impl-ydb_endpoints-ut) -target_include_directories(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints -) -target_link_libraries(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PUBLIC - yutil - cpp-testing-unittest_main - client-impl-ydb_endpoints -) -target_link_options(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut) diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt b/client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 391069a2ef0..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-impl-ydb_endpoints-ut) -target_include_directories(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints -) -target_link_libraries(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-impl-ydb_endpoints -) -target_link_options(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut) diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.linux-aarch64.txt b/client/impl/ydb_endpoints/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 0735675e207..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,76 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-impl-ydb_endpoints-ut) -target_include_directories(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints -) -target_link_libraries(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PUBLIC - - yutil - cpp-testing-unittest_main - client-impl-ydb_endpoints -) -target_link_options(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut) diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt b/client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 6e393797502..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,78 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-impl-ydb_endpoints-ut) -target_include_directories(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints -) -target_link_libraries(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-impl-ydb_endpoints -) -target_link_options(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut) diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.txt b/client/impl/ydb_endpoints/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/impl/ydb_endpoints/ut/CMakeLists.windows-x86_64.txt b/client/impl/ydb_endpoints/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index e2452a54029..00000000000 --- a/client/impl/ydb_endpoints/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,66 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-impl-ydb_endpoints-ut) -target_include_directories(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints -) -target_link_libraries(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - client-impl-ydb_endpoints -) -target_sources(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints/endpoints_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_TARGET - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-impl-ydb_endpoints-ut) diff --git a/client/impl/ydb_endpoints/ut/ya.make b/client/impl/ydb_endpoints/ut/ya.make deleted file mode 100644 index 37a1c572746..00000000000 --- a/client/impl/ydb_endpoints/ut/ya.make +++ /dev/null @@ -1,18 +0,0 @@ -UNITTEST_FOR(client/impl/ydb_endpoints) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -SRCS( - endpoints_ut.cpp -) - -END() diff --git a/client/ydb_coordination/CMakeLists.txt b/client/ydb_coordination/CMakeLists.txt index ccffce2fd8b..75815169cff 100644 --- a/client/ydb_coordination/CMakeLists.txt +++ b/client/ydb_coordination/CMakeLists.txt @@ -1,9 +1,6 @@ -#add_subdirectory(ut) - add_library(cpp-client-ydb_coordination) target_link_libraries(cpp-client-ydb_coordination PUBLIC - yutil tools-enum_parser-enum_serialization_runtime api-grpc diff --git a/client/ydb_coordination/ut/CMakeLists.darwin-arm64.txt b/client/ydb_coordination/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 9e53c7f813e..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_coordination-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_coordination-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-ydb_coordination - api-grpc -) -target_link_options(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination/coordination_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_coordination-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_coordination-ut) diff --git a/client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt b/client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 150b675d38a..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,74 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_coordination-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_coordination-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_coordination - api-grpc -) -target_link_options(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination/coordination_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_coordination-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_coordination-ut) diff --git a/client/ydb_coordination/ut/CMakeLists.linux-aarch64.txt b/client/ydb_coordination/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index d4d911a7252..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,77 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_coordination-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_coordination-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-ydb_coordination - api-grpc -) -target_link_options(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination/coordination_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_coordination-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-ydb_coordination-ut) diff --git a/client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt b/client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 0cc9dda7670..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_coordination-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_coordination-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_coordination - api-grpc -) -target_link_options(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination/coordination_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_coordination-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-ydb_coordination-ut) diff --git a/client/ydb_coordination/ut/CMakeLists.txt b/client/ydb_coordination/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_coordination/ut/CMakeLists.windows-x86_64.txt b/client/ydb_coordination/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 453a17cbf94..00000000000 --- a/client/ydb_coordination/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,67 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_coordination-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_coordination-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_coordination - api-grpc -) -target_sources(ydb-public-sdk-cpp-client-ydb_coordination-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_coordination/coordination_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_coordination-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_coordination-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_coordination-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_coordination-ut) diff --git a/client/ydb_coordination/ut/ya.make b/client/ydb_coordination/ut/ya.make deleted file mode 100644 index 52c2dcc8c68..00000000000 --- a/client/ydb_coordination/ut/ya.make +++ /dev/null @@ -1,22 +0,0 @@ -UNITTEST_FOR(client/ydb_coordination) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -PEERDIR( - ydb/public/api/grpc -) - -SRCS( - coordination_ut.cpp -) - -END() diff --git a/client/ydb_driver/CMakeLists.txt b/client/ydb_driver/CMakeLists.txt index 9731aaa9fc0..92104ec637c 100644 --- a/client/ydb_driver/CMakeLists.txt +++ b/client/ydb_driver/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(cpp-client-ydb_driver) target_link_libraries(cpp-client-ydb_driver PUBLIC diff --git a/client/ydb_driver/ut/CMakeLists.darwin-arm64.txt b/client/ydb_driver/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 3ffbcca952e..00000000000 --- a/client/ydb_driver/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_driver-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_driver-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-ydb_driver - cpp-client-ydb_table -) -target_link_options(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver/driver_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_driver-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_driver-ut) diff --git a/client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt b/client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 4b1140aadf0..00000000000 --- a/client/ydb_driver/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,74 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_driver-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_driver-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_driver - cpp-client-ydb_table -) -target_link_options(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver/driver_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_driver-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_driver-ut) diff --git a/client/ydb_driver/ut/CMakeLists.linux-aarch64.txt b/client/ydb_driver/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index bb58428492a..00000000000 --- a/client/ydb_driver/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,77 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_driver-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_driver-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-ydb_driver - cpp-client-ydb_table -) -target_link_options(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver/driver_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_driver-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-ydb_driver-ut) diff --git a/client/ydb_driver/ut/CMakeLists.linux-x86_64.txt b/client/ydb_driver/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index ef5f410bace..00000000000 --- a/client/ydb_driver/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_driver-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_driver-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_driver - cpp-client-ydb_table -) -target_link_options(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver/driver_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_driver-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-ydb_driver-ut) diff --git a/client/ydb_driver/ut/CMakeLists.txt b/client/ydb_driver/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_driver/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_driver/ut/CMakeLists.windows-x86_64.txt b/client/ydb_driver/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index ced25b1f6ce..00000000000 --- a/client/ydb_driver/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,67 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_driver-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_driver-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_driver - cpp-client-ydb_table -) -target_sources(ydb-public-sdk-cpp-client-ydb_driver-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_driver/driver_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_driver-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_driver-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_driver-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_driver-ut) diff --git a/client/ydb_driver/ut/ya.make b/client/ydb_driver/ut/ya.make deleted file mode 100644 index b51e3c259c1..00000000000 --- a/client/ydb_driver/ut/ya.make +++ /dev/null @@ -1,22 +0,0 @@ -UNITTEST_FOR(client/ydb_driver) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -PEERDIR( - client/ydb_table -) - -SRCS( - driver_ut.cpp -) - -END() diff --git a/client/ydb_params/CMakeLists.txt b/client/ydb_params/CMakeLists.txt index 967eacdf377..738482f1abe 100644 --- a/client/ydb_params/CMakeLists.txt +++ b/client/ydb_params/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(cpp-client-ydb_params) target_link_libraries(cpp-client-ydb_params PUBLIC diff --git a/client/ydb_params/ut/CMakeLists.darwin-arm64.txt b/client/ydb_params/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 588d2088f38..00000000000 --- a/client/ydb_params/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_params-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_params-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-ydb_params - public-lib-yson_value -) -target_link_options(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params/params_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_params-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_params-ut) diff --git a/client/ydb_params/ut/CMakeLists.darwin-x86_64.txt b/client/ydb_params/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index cca44fa486c..00000000000 --- a/client/ydb_params/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,74 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_params-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_params-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_params - public-lib-yson_value -) -target_link_options(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params/params_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_params-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_params-ut) diff --git a/client/ydb_params/ut/CMakeLists.linux-aarch64.txt b/client/ydb_params/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 8b8ae26411f..00000000000 --- a/client/ydb_params/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,77 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_params-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_params-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-ydb_params - public-lib-yson_value -) -target_link_options(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params/params_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_params-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-ydb_params-ut) diff --git a/client/ydb_params/ut/CMakeLists.linux-x86_64.txt b/client/ydb_params/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index af611398016..00000000000 --- a/client/ydb_params/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_params-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_params-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_params - public-lib-yson_value -) -target_link_options(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params/params_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_params-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-ydb_params-ut) diff --git a/client/ydb_params/ut/CMakeLists.txt b/client/ydb_params/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_params/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_params/ut/CMakeLists.windows-x86_64.txt b/client/ydb_params/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 00694826381..00000000000 --- a/client/ydb_params/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,67 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_params-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_params-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_params - public-lib-yson_value -) -target_sources(ydb-public-sdk-cpp-client-ydb_params-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_params/params_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_params-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_params-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_params-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_params-ut) diff --git a/client/ydb_params/ut/ya.make b/client/ydb_params/ut/ya.make deleted file mode 100644 index 62115e46532..00000000000 --- a/client/ydb_params/ut/ya.make +++ /dev/null @@ -1,22 +0,0 @@ -UNITTEST_FOR(client/ydb_params) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -PEERDIR( - ydb/public/lib/yson_value -) - -SRCS( - params_ut.cpp -) - -END() diff --git a/client/ydb_persqueue_core/ut/compress_executor_ut.cpp b/client/ydb_persqueue_core/ut/compress_executor_ut.cpp index c79d2b7daa7..09e0b5ec74a 100644 --- a/client/ydb_persqueue_core/ut/compress_executor_ut.cpp +++ b/client/ydb_persqueue_core/ut/compress_executor_ut.cpp @@ -55,7 +55,7 @@ Y_UNIT_TEST_SUITE(CompressExecutor) { } UNIT_ASSERT(!waitEventFuture.HasValue()); - TYdbStringBuilder msgBuilder; + TStringBuilder msgBuilder; while (msgBuilder.size() < 100_KB) { msgBuilder << "0123456789abcdefghijk"; } diff --git a/client/ydb_persqueue_core/ut/compression_ut.cpp b/client/ydb_persqueue_core/ut/compression_ut.cpp index cab143c39a8..bb67f0819be 100644 --- a/client/ydb_persqueue_core/ut/compression_ut.cpp +++ b/client/ydb_persqueue_core/ut/compression_ut.cpp @@ -33,7 +33,7 @@ Y_UNIT_TEST_SUITE(Compression) { } Ydb::PersQueue::V1::AlterTopicRequest request; - request.set_path(TYdbStringBuilder() << "/Root/PQ/rt3.dc1--" << setup.GetTestTopic()); + request.set_path(TStringBuilder() << "/Root/PQ/rt3.dc1--" << setup.GetTestTopic()); auto props = request.mutable_settings(); props->set_partitions_count(1); props->set_supported_format(Ydb::PersQueue::V1::TopicSettings::FORMAT_BASE); diff --git a/client/ydb_persqueue_core/ut/read_session_ut.cpp b/client/ydb_persqueue_core/ut/read_session_ut.cpp index 8117e7e7114..40dcf178019 100644 --- a/client/ydb_persqueue_core/ut/read_session_ut.cpp +++ b/client/ydb_persqueue_core/ut/read_session_ut.cpp @@ -38,7 +38,7 @@ std::string Compress(const std::string& sourceData, Ydb::PersQueue::V1::Codec co } std::string compressed; - std::stringOutput out(compressed); + TStringOutput out(compressed); THolder coder; switch (codec) { case Ydb::PersQueue::V1::CODEC_GZIP: diff --git a/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h b/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h index 79563d67910..8412dca1ff5 100644 --- a/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h +++ b/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h @@ -40,7 +40,7 @@ class TPersQueueYdbSdkTestSetup : public ::NPersQueue::SDKTestSetup { NYdb::TDriver& GetDriver() { if (!Driver) { NYdb::TDriverConfig cfg; - cfg.SetEndpoint(TYdbStringBuilder() << "localhost:" << Server.GrpcPort); + cfg.SetEndpoint(TStringBuilder() << "localhost:" << Server.GrpcPort); cfg.SetDatabase("/Root"); cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG)); Driver = MakeHolder(cfg); diff --git a/client/ydb_result/CMakeLists.txt b/client/ydb_result/CMakeLists.txt index d7a252c5e30..7de4c863b5a 100644 --- a/client/ydb_result/CMakeLists.txt +++ b/client/ydb_result/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(cpp-client-ydb_result) target_link_libraries(cpp-client-ydb_result PUBLIC @@ -8,7 +6,8 @@ target_link_libraries(cpp-client-ydb_result PUBLIC client-ydb_types-fatal_error_handlers cpp-client-ydb_value cpp-client-ydb_proto - ) +) + target_sources(cpp-client-ydb_result PRIVATE ${CMAKE_SOURCE_DIR}/client/ydb_result/proto_accessor.cpp ${CMAKE_SOURCE_DIR}/client/ydb_result/result.cpp diff --git a/client/ydb_result/ut/CMakeLists.darwin-arm64.txt b/client/ydb_result/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index e84a251a4c0..00000000000 --- a/client/ydb_result/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,73 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_result-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_result-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-ydb_result - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result/result_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_result-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_result-ut) diff --git a/client/ydb_result/ut/CMakeLists.darwin-x86_64.txt b/client/ydb_result/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 8e0932d7d47..00000000000 --- a/client/ydb_result/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,74 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_result-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_result-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_result - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result/result_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_result-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_result-ut) diff --git a/client/ydb_result/ut/CMakeLists.linux-aarch64.txt b/client/ydb_result/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 2d21828d57c..00000000000 --- a/client/ydb_result/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,77 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_result-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_result-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-ydb_result - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result/result_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_result-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-ydb_result-ut) diff --git a/client/ydb_result/ut/CMakeLists.linux-x86_64.txt b/client/ydb_result/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 3157a482414..00000000000 --- a/client/ydb_result/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_result-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_result-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_result - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result/result_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_result-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-ydb_result-ut) diff --git a/client/ydb_result/ut/CMakeLists.txt b/client/ydb_result/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_result/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_result/ut/CMakeLists.windows-x86_64.txt b/client/ydb_result/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 3d471e66a0e..00000000000 --- a/client/ydb_result/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,67 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_result-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_result-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_result - cpp-client-ydb_params -) -target_sources(ydb-public-sdk-cpp-client-ydb_result-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_result/result_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_result-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_result-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_result-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_result-ut) diff --git a/client/ydb_result/ut/ya.make b/client/ydb_result/ut/ya.make deleted file mode 100644 index d139d15b632..00000000000 --- a/client/ydb_result/ut/ya.make +++ /dev/null @@ -1,22 +0,0 @@ -UNITTEST_FOR(client/ydb_result) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -SRCS( - result_ut.cpp -) - -PEERDIR( - client/ydb_params -) - -END() diff --git a/client/ydb_table/impl/table_client.cpp b/client/ydb_table/impl/table_client.cpp index 986ef8197d5..22f7037d12f 100644 --- a/client/ydb_table/impl/table_client.cpp +++ b/client/ydb_table/impl/table_client.cpp @@ -149,7 +149,7 @@ void TTableClient::TImpl::StartPeriodicSessionPoolTask() { ); }; - std::weak_ptr weak = shared_from_this(); + std::weak_ptr weak = weak_from_this(); Connections_->AddPeriodicTask( SessionPool_.CreatePeriodicTask( weak, diff --git a/client/ydb_value/CMakeLists.txt b/client/ydb_value/CMakeLists.txt index d4eb2d03c48..695bc6acd1c 100644 --- a/client/ydb_value/CMakeLists.txt +++ b/client/ydb_value/CMakeLists.txt @@ -1,5 +1,3 @@ -# add_subdirectory(ut) - add_library(cpp-client-ydb_value) target_link_libraries(cpp-client-ydb_value PUBLIC diff --git a/client/ydb_value/ut/CMakeLists.darwin-arm64.txt b/client/ydb_value/ut/CMakeLists.darwin-arm64.txt deleted file mode 100644 index 1d8d722f571..00000000000 --- a/client/ydb_value/ut/CMakeLists.darwin-arm64.txt +++ /dev/null @@ -1,75 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_value-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_value-ut PUBLIC - yutil - cpp-testing-unittest_main - cpp-client-ydb_value - public-lib-json_value - public-lib-yson_value - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value/value_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_value-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_value-ut) diff --git a/client/ydb_value/ut/CMakeLists.darwin-x86_64.txt b/client/ydb_value/ut/CMakeLists.darwin-x86_64.txt deleted file mode 100644 index 5f653b95742..00000000000 --- a/client/ydb_value/ut/CMakeLists.darwin-x86_64.txt +++ /dev/null @@ -1,76 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_value-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_value-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_value - public-lib-json_value - public-lib-yson_value - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - -Wl,-platform_version,macos,11.0,11.0 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value/value_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_value-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_value-ut) diff --git a/client/ydb_value/ut/CMakeLists.linux-aarch64.txt b/client/ydb_value/ut/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 37ff137d32a..00000000000 --- a/client/ydb_value/ut/CMakeLists.linux-aarch64.txt +++ /dev/null @@ -1,79 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_value-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_value-ut PUBLIC - - yutil - cpp-testing-unittest_main - cpp-client-ydb_value - public-lib-json_value - public-lib-yson_value - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value/value_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_value-ut - cpp-malloc-jemalloc -) -vcs_info(ydb-public-sdk-cpp-client-ydb_value-ut) diff --git a/client/ydb_value/ut/CMakeLists.linux-x86_64.txt b/client/ydb_value/ut/CMakeLists.linux-x86_64.txt deleted file mode 100644 index 46024e0f4d9..00000000000 --- a/client/ydb_value/ut/CMakeLists.linux-x86_64.txt +++ /dev/null @@ -1,81 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_value-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_value-ut PUBLIC - - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_value - public-lib-json_value - public-lib-yson_value - cpp-client-ydb_params -) -target_link_options(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value/value_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_value-ut - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache -) -vcs_info(ydb-public-sdk-cpp-client-ydb_value-ut) diff --git a/client/ydb_value/ut/CMakeLists.txt b/client/ydb_value/ut/CMakeLists.txt deleted file mode 100644 index d863ebd1806..00000000000 --- a/client/ydb_value/ut/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -# This file was generated 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 (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA) - include(CMakeLists.linux-aarch64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin-x86_64.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - include(CMakeLists.darwin-arm64.txt) -elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA) - include(CMakeLists.windows-x86_64.txt) -endif() diff --git a/client/ydb_value/ut/CMakeLists.windows-x86_64.txt b/client/ydb_value/ut/CMakeLists.windows-x86_64.txt deleted file mode 100644 index 72667af2247..00000000000 --- a/client/ydb_value/ut/CMakeLists.windows-x86_64.txt +++ /dev/null @@ -1,69 +0,0 @@ - -# This file was generated 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-public-sdk-cpp-client-ydb_value-ut) -target_include_directories(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value -) -target_link_libraries(ydb-public-sdk-cpp-client-ydb_value-ut PUBLIC - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - cpp-client-ydb_value - public-lib-json_value - public-lib-yson_value - cpp-client-ydb_params -) -target_sources(ydb-public-sdk-cpp-client-ydb_value-ut PRIVATE - ${CMAKE_SOURCE_DIR}/client/ydb_value/value_ut.cpp -) -set_property( - TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_TARGET - ydb-public-sdk-cpp-client-ydb_value-ut - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-public-sdk-cpp-client-ydb_value-ut - PROPERTY - TIMEOUT - 600 -) -target_allocator(ydb-public-sdk-cpp-client-ydb_value-ut - system_allocator -) -vcs_info(ydb-public-sdk-cpp-client-ydb_value-ut) diff --git a/client/ydb_value/ut/ya.make b/client/ydb_value/ut/ya.make deleted file mode 100644 index 48f47086e55..00000000000 --- a/client/ydb_value/ut/ya.make +++ /dev/null @@ -1,24 +0,0 @@ -UNITTEST_FOR(client/ydb_value) - -IF (SANITIZER_TYPE == "thread") - TIMEOUT(1200) - SIZE(LARGE) - TAG(ya:fat) -ELSE() - TIMEOUT(600) - SIZE(MEDIUM) -ENDIF() - -FORK_SUBTESTS() - -PEERDIR( - ydb/public/lib/json_value - ydb/public/lib/yson_value - client/ydb_params -) - -SRCS( - value_ut.cpp -) - -END() diff --git a/cmake/common.cmake b/cmake/common.cmake index 6241e19c772..cbc5f66a853 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -184,62 +184,3 @@ function(resources Tgt Output) DEPENDS ${RESOURCE_ARGS_INPUTS} ${rescompiler_bin} ) endfunction() - -function(add_yunittest) - set(opts "") - set(oneval_args NAME TEST_TARGET) - set(multival_args TEST_ARG) - cmake_parse_arguments(YUNITTEST_ARGS - "${opts}" - "${oneval_args}" - "${multival_args}" - ${ARGN} - ) - - get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_FACTOR) - get_property(SPLIT_TYPE TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_TYPE) - - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack") - add_test(NAME ${YUNITTEST_ARGS_NAME} COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack" ${YUNITTEST_ARGS_TEST_ARG}) - set_property(TEST ${YUNITTEST_ARGS_NAME} PROPERTY ENVIRONMENT "source_root=${CMAKE_SOURCE_DIR};build_root=${CMAKE_BINARY_DIR};test_split_factor=${SPLIT_FACTOR};test_split_type=${SPLIT_TYPE}") - return() - endif() - - if (${SPLIT_FACTOR} EQUAL 1) - add_test(NAME ${YUNITTEST_ARGS_NAME} COMMAND ${YUNITTEST_ARGS_TEST_TARGET} ${YUNITTEST_ARGS_TEST_ARG}) - return() - endif() - - if ("${SPLIT_TYPE}") - set(FORK_MODE_ARG --fork-mode ${SPLIT_TYPE}) - endif() - math(EXPR LastIdx "${SPLIT_FACTOR} - 1") - foreach(Idx RANGE ${LastIdx}) - add_test(NAME ${YUNITTEST_ARGS_NAME}_${Idx} - COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/scripts/split_unittest.py --split-factor ${SPLIT_FACTOR} ${FORK_MODE_ARG} --shard ${Idx} - $ ${YUNITTEST_ARGS_TEST_ARG}) - endforeach() -endfunction() - -function(set_yunittest_property) - set(opts "") - set(oneval_args TEST PROPERTY) - set(multival_args ) - cmake_parse_arguments(YUNITTEST_ARGS - "${opts}" - "${oneval_args}" - "${multival_args}" - ${ARGN} - ) - get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR) - - if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack")) - set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) - return() - endif() - - math(EXPR LastIdx "${SPLIT_FACTOR} - 1") - foreach(Idx RANGE ${LastIdx}) - set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) - endforeach() -endfunction() diff --git a/cmake/testing.cmake b/cmake/testing.cmake new file mode 100644 index 00000000000..3c8d786cb7d --- /dev/null +++ b/cmake/testing.cmake @@ -0,0 +1,143 @@ +function(add_yunittest) + set(opts "") + set(oneval_args NAME TEST_TARGET) + set(multival_args TEST_ARG) + cmake_parse_arguments(YUNITTEST_ARGS + "${opts}" + "${oneval_args}" + "${multival_args}" + ${ARGN} + ) + + get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_FACTOR) + get_property(SPLIT_TYPE TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_TYPE) + + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack") + add_test(NAME ${YUNITTEST_ARGS_NAME} COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack" ${YUNITTEST_ARGS_TEST_ARG}) + set_property(TEST ${YUNITTEST_ARGS_NAME} PROPERTY ENVIRONMENT "source_root=${CMAKE_SOURCE_DIR};build_root=${CMAKE_BINARY_DIR};test_split_factor=${SPLIT_FACTOR};test_split_type=${SPLIT_TYPE}") + return() + endif() + + if (${SPLIT_FACTOR} EQUAL 1) + add_test(NAME ${YUNITTEST_ARGS_NAME} COMMAND ${YUNITTEST_ARGS_TEST_TARGET} ${YUNITTEST_ARGS_TEST_ARG}) + return() + endif() + + if ("${SPLIT_TYPE}") + set(FORK_MODE_ARG --fork-mode ${SPLIT_TYPE}) + endif() + math(EXPR LastIdx "${SPLIT_FACTOR} - 1") + foreach(Idx RANGE ${LastIdx}) + add_test(NAME ${YUNITTEST_ARGS_NAME}_${Idx} + COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/scripts/split_unittest.py --split-factor ${SPLIT_FACTOR} ${FORK_MODE_ARG} --shard ${Idx} + $ ${YUNITTEST_ARGS_TEST_ARG}) + endforeach() +endfunction() + +function(set_yunittest_property) + set(opts "") + set(oneval_args TEST PROPERTY) + set(multival_args ) + cmake_parse_arguments(YUNITTEST_ARGS + "${opts}" + "${oneval_args}" + "${multival_args}" + ${ARGN} + ) + get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR) + + if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack")) + set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + return() + endif() + + math(EXPR LastIdx "${SPLIT_FACTOR} - 1") + foreach(Idx RANGE ${LastIdx}) + set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}) + endforeach() +endfunction() + +function(add_ydb_test) + set(opts "") + set(oneval_args NAME) + set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES) + cmake_parse_arguments(YDB_TEST + "${opts}" + "${oneval_args}" + "${multival_args}" + ${ARGN} + ) + + add_executable(${YDB_TEST_NAME}) + target_include_directories(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_INCLUDE_DIRS}) + target_link_libraries(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_LINK_LIBRARIES}) + target_sources(${YDB_TEST_NAME} PRIVATE ${YDB_TEST_SOURCES}) + + if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + target_link_libraries(${YDB_TEST_NAME} PRIVATE + library-cpp-cpuid_check + ) + endif() + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_options(${YDB_TEST_NAME} PRIVATE + -ldl + -lrt + -Wl,--no-as-needed + -lpthread + ) + elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_link_options(${YDB_TEST_NAME} PRIVATE + -Wl,-platform_version,macos,11.0,11.0 + -framework + CoreFoundation + ) + endif() + + set_property( + TARGET + ${YDB_TEST_NAME} + PROPERTY + SPLIT_FACTOR + 10 + ) + + add_yunittest( + NAME + ${YDB_TEST_NAME} + TEST_TARGET + ${YDB_TEST_NAME} + TEST_ARG + --print-before-suite + --print-before-test + --fork-tests + --print-times + --show-fails + ) + + set_yunittest_property( + TEST + ${YDB_TEST_NAME} + PROPERTY + LABELS + MEDIUM + ) + + set_yunittest_property( + TEST + ${YDB_TEST_NAME} + PROPERTY + PROCESSORS + 1 + ) + + set_yunittest_property( + TEST + ${YDB_TEST_NAME} + PROPERTY + TIMEOUT + 600 + ) + + vcs_info(${YDB_TEST_NAME}) +endfunction() diff --git a/library/cpp/dbg_output/engine.cpp b/library/cpp/dbg_output/engine.cpp index 55de5ec04d8..bff32d32d79 100644 --- a/library/cpp/dbg_output/engine.cpp +++ b/library/cpp/dbg_output/engine.cpp @@ -15,7 +15,7 @@ DBGDUMP_INLINE_IF_INCLUDED void TDumpBase::String(const std::string_view& s) { } } -DBGDUMP_INLINE_IF_INCLUDED void TDumpBase::String(const std::wstring_view& s) { +DBGDUMP_INLINE_IF_INCLUDED void TDumpBase::String(const std::u16string_view& s) { Raw("w"); String(ToString(s)); } diff --git a/library/cpp/dbg_output/engine.h b/library/cpp/dbg_output/engine.h index 066f4abc41c..0a6e4fbeb4e 100644 --- a/library/cpp/dbg_output/engine.h +++ b/library/cpp/dbg_output/engine.h @@ -46,7 +46,7 @@ struct TDumpBase: public ::NDumpPrivate::TADLBase { void Char(wchar16 ch); void String(const std::string_view& s); - void String(const std::wstring_view& s); + void String(const std::u16string_view& s); void Raw(const std::string_view& s); diff --git a/library/cpp/yt/memory/CMakeLists.txt b/library/cpp/yt/memory/CMakeLists.txt index 9382acd42bf..e82ab8dc389 100644 --- a/library/cpp/yt/memory/CMakeLists.txt +++ b/library/cpp/yt/memory/CMakeLists.txt @@ -2,7 +2,6 @@ add_library(cpp-yt-memory) target_link_libraries(cpp-yt-memory PUBLIC yutil - cpp-sanitizer-include cpp-yt-assert cpp-yt-misc cpp-yt-malloc diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 00000000000..4889422a11f --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(client) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt new file mode 100644 index 00000000000..8e8036e5f68 --- /dev/null +++ b/tests/client/CMakeLists.txt @@ -0,0 +1,95 @@ +add_ydb_test(NAME client-ydb_coordination-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/ydb_coordination + SOURCES + coordination_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Coordination + api-grpc +) + +add_ydb_test(NAME client-extensions-discovery_mutator-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/extensions/discovery_mutator + SOURCES + discovery_mutator_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::DiscoveryMutator + YDB-CPP-SDK::Table +) + +add_ydb_test(NAME client-ydb_driver-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/ydb_driver + SOURCES + driver_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Driver + YDB-CPP-SDK::Table +) + +add_ydb_test(NAME client-impl-ydb_endpoints-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/impl/ydb_endpoints + SOURCES + endpoints_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + client-impl-ydb_endpoints +) + +add_ydb_test(NAME client-ydb_params-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/ydb_params + SOURCES + params_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Params + public-lib-yson_value +) + +add_ydb_test(NAME client-ydb_result-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/ydb_result + SOURCES + result_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Result + YDB-CPP-SDK::Params +) + +add_ydb_test(NAME client-ydb_value-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/ydb_value + SOURCES + value_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Value + public-lib-json_value + public-lib-yson_value + YDB-CPP-SDK::Params +) + +add_ydb_test(NAME client-draft-ut + INCLUDE_DIRS + ${CMAKE_SOURCE_DIR}/client/draft + SOURCES + ydb_scripting_response_headers_ut.cpp + LINK_LIBRARIES + yutil + cpp-testing-unittest_main + YDB-CPP-SDK::Draft +) diff --git a/client/ydb_coordination/coordination_ut.cpp b/tests/client/coordination_ut.cpp similarity index 100% rename from client/ydb_coordination/coordination_ut.cpp rename to tests/client/coordination_ut.cpp diff --git a/client/extensions/discovery_mutator/discovery_mutator_ut.cpp b/tests/client/discovery_mutator_ut.cpp similarity index 100% rename from client/extensions/discovery_mutator/discovery_mutator_ut.cpp rename to tests/client/discovery_mutator_ut.cpp diff --git a/client/ydb_driver/driver_ut.cpp b/tests/client/driver_ut.cpp similarity index 100% rename from client/ydb_driver/driver_ut.cpp rename to tests/client/driver_ut.cpp diff --git a/client/impl/ydb_endpoints/endpoints_ut.cpp b/tests/client/endpoints_ut.cpp similarity index 100% rename from client/impl/ydb_endpoints/endpoints_ut.cpp rename to tests/client/endpoints_ut.cpp diff --git a/client/ydb_params/params_ut.cpp b/tests/client/params_ut.cpp similarity index 100% rename from client/ydb_params/params_ut.cpp rename to tests/client/params_ut.cpp diff --git a/client/ydb_result/result_ut.cpp b/tests/client/result_ut.cpp similarity index 100% rename from client/ydb_result/result_ut.cpp rename to tests/client/result_ut.cpp diff --git a/client/ydb_value/value_ut.cpp b/tests/client/value_ut.cpp similarity index 97% rename from client/ydb_value/value_ut.cpp rename to tests/client/value_ut.cpp index 243961d76c2..f529d58cfe8 100644 --- a/client/ydb_value/value_ut.cpp +++ b/tests/client/value_ut.cpp @@ -1,5 +1,6 @@ +#include "value.h" + #include -#include #include #include #include @@ -7,7 +8,6 @@ #include #include -#include #include namespace NYdb { @@ -61,7 +61,7 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); UNIT_ASSERT_NO_DIFF(FormatType(protoType), R"(Struct<'Member1':Uint32,'Member2':List,'Member3':Tuple>)"); @@ -87,7 +87,7 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); UNIT_ASSERT_NO_DIFF(FormatType(protoType), R"(Dict>)"); @@ -104,7 +104,7 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); UNIT_ASSERT_NO_DIFF(FormatType(protoType), R"(Tagged)"); @@ -287,10 +287,10 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); Ydb::Value protoValue; - NProtoBuf::TextFormat::ParseFromString(protoValueStr, &protoValue); + google::protobuf::TextFormat::ParseFromString(protoValueStr, &protoValue); TValue value(TType(protoType), protoValue); @@ -341,10 +341,10 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); Ydb::Value protoValue; - NProtoBuf::TextFormat::ParseFromString(protoValueStr, &protoValue); + google::protobuf::TextFormat::ParseFromString(protoValueStr, &protoValue); TValue value(TType(protoType), protoValue); @@ -428,10 +428,10 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); Ydb::Value protoValue; - NProtoBuf::TextFormat::ParseFromString(protoValueStr, &protoValue); + google::protobuf::TextFormat::ParseFromString(protoValueStr, &protoValue); TValue value(TType(protoType), protoValue); @@ -507,10 +507,10 @@ Y_UNIT_TEST_SUITE(YdbValue) { )"; Ydb::Type protoType; - NProtoBuf::TextFormat::ParseFromString(protoTypeStr, &protoType); + google::protobuf::TextFormat::ParseFromString(protoTypeStr, &protoType); Ydb::Value protoValue; - NProtoBuf::TextFormat::ParseFromString(protoValueStr, &protoValue); + google::protobuf::TextFormat::ParseFromString(protoValueStr, &protoValue); TValue value(TType(protoType), protoValue); TValueParser parser(value); @@ -782,7 +782,7 @@ Y_UNIT_TEST_SUITE(YdbValue) { "}\n"; std::string protoValueStr; - NProtoBuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr); + google::protobuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr); UNIT_ASSERT_NO_DIFF(protoValueStr, expectedProtoValueStr); } @@ -844,7 +844,7 @@ Y_UNIT_TEST_SUITE(YdbValue) { "}\n"; std::string protoValueStr; - NProtoBuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr); + google::protobuf::TextFormat::PrintToString(value.GetProto(), &protoValueStr); UNIT_ASSERT_NO_DIFF(protoValueStr, expectedProtoValueStr); } diff --git a/client/draft/ydb_scripting_response_headers_ut.cpp b/tests/client/ydb_scripting_response_headers_ut.cpp similarity index 97% rename from client/draft/ydb_scripting_response_headers_ut.cpp rename to tests/client/ydb_scripting_response_headers_ut.cpp index 8e140bb5958..4003affb4aa 100644 --- a/client/draft/ydb_scripting_response_headers_ut.cpp +++ b/tests/client/ydb_scripting_response_headers_ut.cpp @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(ResponseHeaders) { Y_UNIT_TEST(PassHeader) { TMockSlyDbProxy slyDbProxy; - std::string addr = "localhost:2135"; + std::string addr = "localhost:10000"; auto server = StartGrpcServer(addr, slyDbProxy); diff --git a/util/stream/output.cpp b/util/stream/output.cpp index 41f98362da9..9e507ec10c8 100644 --- a/util/stream/output.cpp +++ b/util/stream/output.cpp @@ -227,6 +227,11 @@ DEF_OPTIONAL(i64); DEF_OPTIONAL(ui64); DEF_OPTIONAL(std::string); DEF_OPTIONAL(std::string_view); +DEF_OPTIONAL(std::u16string); +DEF_OPTIONAL(std::u16string_view); +DEF_OPTIONAL(double); +DEF_OPTIONAL(unsigned char); +DEF_OPTIONAL(signed char); #if defined(_android_) namespace { diff --git a/ydb/public/lib/json_value/CMakeLists.txt b/ydb/public/lib/json_value/CMakeLists.txt index 5d799dfa3b2..0b05122a48b 100644 --- a/ydb/public/lib/json_value/CMakeLists.txt +++ b/ydb/public/lib/json_value/CMakeLists.txt @@ -3,21 +3,14 @@ add_library(public-lib-json_value) target_link_libraries(public-lib-json_value PUBLIC - yutil - cpp-json-writer - cpp-string_utils-base64 - cpp-client-ydb_result - cpp-client-ydb_value - ydb-library-uuid - cpp-string_builder + yutil + cpp-json-writer + cpp-string_utils-base64 + cpp-client-ydb_result + cpp-client-ydb_value + ydb-library-uuid ) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT HAVE_CUDA) - target_link_libraries(public-lib-json_value PUBLIC - - ) -endif() - target_sources(public-lib-json_value PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/public/lib/json_value/ydb_json_value.cpp + ${CMAKE_SOURCE_DIR}/ydb/public/lib/json_value/ydb_json_value.cpp )