diff options
author | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-02-09 18:37:17 +0300 |
---|---|---|
committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-02-09 18:37:17 +0300 |
commit | 1313b9f7953e30ef6b9ad89345605d540058ec78 (patch) | |
tree | 3ba43097164c1f633e28f3cffdee01d06e0d3d26 | |
parent | db46a2dc333abc89f2d6361e02e351088bcc8011 (diff) | |
download | ydb-1313b9f7953e30ef6b9ad89345605d540058ec78.tar.gz |
Make all ut_blobstorage tests Large when launched with sanitizers,
Initital
Revert "Make Decommit3dc test large when using sanitizers,"
This reverts commit ad55c660e0983e656167e091fe279b8af1a766d9, reversing
changes made to bca0942d98191207eef88cb15cd0af493589c2e0.
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt | 2 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-aarch64.txt | 2 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt | 2 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp (renamed from ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp) | 0 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.darwin.txt | 72 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux-aarch64.txt | 75 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux.txt | 77 | ||||
-rw-r--r-- | ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.txt | 15 |
8 files changed, 3 insertions, 242 deletions
diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt index 485a532a4dd..5acdafe43bf 100644 --- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt +++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.darwin.txt @@ -9,7 +9,6 @@ add_subdirectory(lib) add_subdirectory(ut_blob_depot) add_subdirectory(ut_blob_depot_fat) -add_subdirectory(ut_decommit) add_subdirectory(ut_donor) add_subdirectory(ut_group_reconfiguration) add_subdirectory(ut_osiris) @@ -41,6 +40,7 @@ target_sources(ydb-core-blobstorage-ut_blobstorage PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/block_race.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/counting_events.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/defrag.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/encryption.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/extra_block_checks.cpp diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-aarch64.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-aarch64.txt index 193724bd013..df6771f5757 100644 --- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-aarch64.txt +++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux-aarch64.txt @@ -9,7 +9,6 @@ add_subdirectory(lib) add_subdirectory(ut_blob_depot) add_subdirectory(ut_blob_depot_fat) -add_subdirectory(ut_decommit) add_subdirectory(ut_donor) add_subdirectory(ut_group_reconfiguration) add_subdirectory(ut_osiris) @@ -44,6 +43,7 @@ target_sources(ydb-core-blobstorage-ut_blobstorage PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/block_race.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/counting_events.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/defrag.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/encryption.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/extra_block_checks.cpp diff --git a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt index e08e909e298..0cb03a93448 100644 --- a/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt +++ b/ydb/core/blobstorage/ut_blobstorage/CMakeLists.linux.txt @@ -9,7 +9,6 @@ add_subdirectory(lib) add_subdirectory(ut_blob_depot) add_subdirectory(ut_blob_depot_fat) -add_subdirectory(ut_decommit) add_subdirectory(ut_donor) add_subdirectory(ut_group_reconfiguration) add_subdirectory(ut_osiris) @@ -46,6 +45,7 @@ target_sources(ydb-core-blobstorage-ut_blobstorage PRIVATE ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/assimilation.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/block_race.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/counting_events.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/defrag.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/encryption.cpp ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/extra_block_checks.cpp diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp b/ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp index 811d791db6c..811d791db6c 100644 --- a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp +++ b/ydb/core/blobstorage/ut_blobstorage/decommit_3dc.cpp diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.darwin.txt b/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.darwin.txt deleted file mode 100644 index a4e68a7039f..00000000000 --- a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.darwin.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-core-blobstorage-ut_blobstorage-ut_decommit) -target_include_directories(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage -) -target_link_libraries(ydb-core-blobstorage-ut_blobstorage-ut_decommit PUBLIC - contrib-libs-cxxsupp - yutil - library-cpp-cpuid_check - cpp-testing-unittest_main - blobstorage-ut_blobstorage-lib -) -target_link_options(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - -Wl,-no_deduplicate - -Wl,-sdk_version,10.15 - -fPIC - -fPIC - -framework - CoreFoundation -) -target_sources(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp -) -set_property( - TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - TIMEOUT - 600 -) -vcs_info(ydb-core-blobstorage-ut_blobstorage-ut_decommit) diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux-aarch64.txt b/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux-aarch64.txt deleted file mode 100644 index 76e05df043c..00000000000 --- a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux-aarch64.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-core-blobstorage-ut_blobstorage-ut_decommit) -target_include_directories(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage -) -target_link_libraries(ydb-core-blobstorage-ut_blobstorage-ut_decommit PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - library-cpp-lfalloc - cpp-testing-unittest_main - blobstorage-ut_blobstorage-lib -) -target_link_options(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp -) -set_property( - TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - TIMEOUT - 600 -) -vcs_info(ydb-core-blobstorage-ut_blobstorage-ut_decommit) diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux.txt b/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux.txt deleted file mode 100644 index 79988ba55f4..00000000000 --- a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.linux.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-core-blobstorage-ut_blobstorage-ut_decommit) -target_include_directories(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage -) -target_link_libraries(ydb-core-blobstorage-ut_blobstorage-ut_decommit PUBLIC - contrib-libs-linux-headers - contrib-libs-cxxsupp - yutil - cpp-malloc-tcmalloc - libs-tcmalloc-no_percpu_cache - library-cpp-cpuid_check - cpp-testing-unittest_main - blobstorage-ut_blobstorage-lib -) -target_link_options(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - -ldl - -lrt - -Wl,--no-as-needed - -fPIC - -fPIC - -lpthread - -lrt - -ldl -) -target_sources(ydb-core-blobstorage-ut_blobstorage-ut_decommit PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/ut_blobstorage/ut_decommit/decommit_3dc.cpp -) -set_property( - TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - SPLIT_FACTOR - 10 -) -add_yunittest( - NAME - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_TARGET - ydb-core-blobstorage-ut_blobstorage-ut_decommit - TEST_ARG - --print-before-suite - --print-before-test - --fork-tests - --print-times - --show-fails -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - LABELS - MEDIUM -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - PROCESSORS - 1 -) -set_yunittest_property( - TEST - ydb-core-blobstorage-ut_blobstorage-ut_decommit - PROPERTY - TIMEOUT - 600 -) -vcs_info(ydb-core-blobstorage-ut_blobstorage-ut_decommit) diff --git a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.txt b/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.txt deleted file mode 100644 index 5bb4faffb40..00000000000 --- a/ydb/core/blobstorage/ut_blobstorage/ut_decommit/CMakeLists.txt +++ /dev/null @@ -1,15 +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_PROCESSOR STREQUAL "aarch64" AND UNIX AND NOT APPLE AND NOT ANDROID) - include(CMakeLists.linux-aarch64.txt) -elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - include(CMakeLists.darwin.txt) -elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE AND NOT ANDROID) - include(CMakeLists.linux.txt) -endif() |