diff options
author | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-03-18 05:49:29 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-03-18 05:49:29 +0300 |
commit | 2acc0fc3cdc40434ea286f2fac62386e3fd9c19d (patch) | |
tree | d775b1837c06d0b0579f538c448748a2355d3dfb | |
parent | 69416ad3aa73c24e2098d64de73250def4b918e1 (diff) | |
download | ydb-2acc0fc3cdc40434ea286f2fac62386e3fd9c19d.tar.gz |
Move validation proto plugin in to public/lib KIKIMR-14468
ref:c691672a442302ec0c05bb0528429891546971f6
-rw-r--r-- | CMakeLists.darwin.txt | 6 | ||||
-rw-r--r-- | CMakeLists.linux.txt | 6 | ||||
-rw-r--r-- | ydb/public/lib/validation/CMakeLists.darwin.txt (renamed from ydb/core/grpc_services/validation/CMakeLists.darwin.txt) | 4 | ||||
-rw-r--r-- | ydb/public/lib/validation/CMakeLists.linux.txt (renamed from ydb/core/grpc_services/validation/CMakeLists.linux.txt) | 4 | ||||
-rw-r--r-- | ydb/public/lib/validation/CMakeLists.txt (renamed from ydb/core/grpc_services/validation/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | ydb/public/lib/validation/helpers.cpp (renamed from ydb/core/grpc_services/validation/helpers.cpp) | 0 | ||||
-rw-r--r-- | ydb/public/lib/validation/helpers.h (renamed from ydb/core/grpc_services/validation/helpers.h) | 0 | ||||
-rw-r--r-- | ydb/public/lib/validation/main.cpp (renamed from ydb/core/grpc_services/validation/main.cpp) | 0 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut.cpp (renamed from ydb/core/grpc_services/validation/ut.cpp) | 2 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut/CMakeLists.darwin.txt (renamed from ydb/core/grpc_services/validation/ut/CMakeLists.darwin.txt) | 20 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut/CMakeLists.linux.txt (renamed from ydb/core/grpc_services/validation/ut/CMakeLists.linux.txt) | 20 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut/CMakeLists.txt (renamed from ydb/core/grpc_services/validation/ut/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut/protos/CMakeLists.txt (renamed from ydb/core/grpc_services/validation/ut/protos/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | ydb/public/lib/validation/ut/protos/validation_test.proto (renamed from ydb/core/grpc_services/validation/ut/protos/validation_test.proto) | 0 |
14 files changed, 32 insertions, 32 deletions
diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt index 78fa522f97..22e1b582be 100644 --- a/CMakeLists.darwin.txt +++ b/CMakeLists.darwin.txt @@ -112,7 +112,7 @@ add_subdirectory(ydb/library/yql/public/issue) add_subdirectory(ydb/public/api/protos) add_subdirectory(ydb/public/api/protos/annotations) add_subdirectory(tools/enum_parser/enum_serialization_runtime) -add_subdirectory(ydb/core/grpc_services/validation) +add_subdirectory(ydb/public/lib/validation) add_subdirectory(tools/enum_parser/enum_parser/bin) add_subdirectory(tools/enum_parser/parse_enum) add_subdirectory(library/cpp/cppparser) @@ -938,8 +938,6 @@ add_subdirectory(ydb/core/erasure/ut_rope) add_subdirectory(ydb/core/erasure/ut_perf) add_subdirectory(ydb/core/formats/ut) add_subdirectory(ydb/core/grpc_services/ut) -add_subdirectory(ydb/core/grpc_services/validation/ut) -add_subdirectory(ydb/core/grpc_services/validation/ut/protos) add_subdirectory(ydb/core/grpc_streaming/ut) add_subdirectory(ydb/core/grpc_streaming/ut/grpc) add_subdirectory(ydb/core/health_check/ut) @@ -1171,6 +1169,8 @@ add_subdirectory(ydb/library/yql/utils/log/ut) add_subdirectory(ydb/public/lib/idx_test/ut) add_subdirectory(ydb/public/lib/json_value/ut) add_subdirectory(ydb/public/lib/operation_id/ut) +add_subdirectory(ydb/public/lib/validation/ut) +add_subdirectory(ydb/public/lib/validation/ut/protos) add_subdirectory(ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_driver/ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_table/impl/ut) diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt index 835cb8ed36..a3112c0e0d 100644 --- a/CMakeLists.linux.txt +++ b/CMakeLists.linux.txt @@ -190,7 +190,7 @@ add_subdirectory(ydb/library/yql/public/issue) add_subdirectory(ydb/public/api/protos) add_subdirectory(ydb/public/api/protos/annotations) add_subdirectory(tools/enum_parser/enum_serialization_runtime) -add_subdirectory(ydb/core/grpc_services/validation) +add_subdirectory(ydb/public/lib/validation) add_subdirectory(tools/enum_parser/enum_parser/bin) add_subdirectory(tools/enum_parser/parse_enum) add_subdirectory(library/cpp/cppparser) @@ -1032,8 +1032,6 @@ add_subdirectory(ydb/core/erasure/ut_rope) add_subdirectory(ydb/core/erasure/ut_perf) add_subdirectory(ydb/core/formats/ut) add_subdirectory(ydb/core/grpc_services/ut) -add_subdirectory(ydb/core/grpc_services/validation/ut) -add_subdirectory(ydb/core/grpc_services/validation/ut/protos) add_subdirectory(ydb/core/grpc_streaming/ut) add_subdirectory(ydb/core/grpc_streaming/ut/grpc) add_subdirectory(ydb/core/health_check/ut) @@ -1266,6 +1264,8 @@ add_subdirectory(ydb/library/yql/utils/log/ut) add_subdirectory(ydb/public/lib/idx_test/ut) add_subdirectory(ydb/public/lib/json_value/ut) add_subdirectory(ydb/public/lib/operation_id/ut) +add_subdirectory(ydb/public/lib/validation/ut) +add_subdirectory(ydb/public/lib/validation/ut/protos) add_subdirectory(ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/with_offset_ranges_mode_ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_driver/ut) add_subdirectory(ydb/public/sdk/cpp/client/ydb_table/impl/ut) diff --git a/ydb/core/grpc_services/validation/CMakeLists.darwin.txt b/ydb/public/lib/validation/CMakeLists.darwin.txt index 011bb7896d..dee562c94c 100644 --- a/ydb/core/grpc_services/validation/CMakeLists.darwin.txt +++ b/ydb/public/lib/validation/CMakeLists.darwin.txt @@ -16,8 +16,8 @@ target_link_libraries(validation PUBLIC api-protos-annotations ) target_sources(validation PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/helpers.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/main.cpp + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/helpers.cpp + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/main.cpp ) target_link_flags(validation PUBLIC diff --git a/ydb/core/grpc_services/validation/CMakeLists.linux.txt b/ydb/public/lib/validation/CMakeLists.linux.txt index 74ba528506..2fe1e25a37 100644 --- a/ydb/core/grpc_services/validation/CMakeLists.linux.txt +++ b/ydb/public/lib/validation/CMakeLists.linux.txt @@ -17,8 +17,8 @@ target_link_libraries(validation PUBLIC api-protos-annotations ) target_sources(validation PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/helpers.cpp - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/main.cpp + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/helpers.cpp + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/main.cpp ) target_link_flags(validation PUBLIC diff --git a/ydb/core/grpc_services/validation/CMakeLists.txt b/ydb/public/lib/validation/CMakeLists.txt index a681d385f3..a681d385f3 100644 --- a/ydb/core/grpc_services/validation/CMakeLists.txt +++ b/ydb/public/lib/validation/CMakeLists.txt diff --git a/ydb/core/grpc_services/validation/helpers.cpp b/ydb/public/lib/validation/helpers.cpp index 0b30fdcec7..0b30fdcec7 100644 --- a/ydb/core/grpc_services/validation/helpers.cpp +++ b/ydb/public/lib/validation/helpers.cpp diff --git a/ydb/core/grpc_services/validation/helpers.h b/ydb/public/lib/validation/helpers.h index 60047a9dd7..60047a9dd7 100644 --- a/ydb/core/grpc_services/validation/helpers.h +++ b/ydb/public/lib/validation/helpers.h diff --git a/ydb/core/grpc_services/validation/main.cpp b/ydb/public/lib/validation/main.cpp index 68c4bda65c..68c4bda65c 100644 --- a/ydb/core/grpc_services/validation/main.cpp +++ b/ydb/public/lib/validation/main.cpp diff --git a/ydb/core/grpc_services/validation/ut.cpp b/ydb/public/lib/validation/ut.cpp index ca414df810..ae736bf895 100644 --- a/ydb/core/grpc_services/validation/ut.cpp +++ b/ydb/public/lib/validation/ut.cpp @@ -1,4 +1,4 @@ -#include <ydb/core/grpc_services/validation/ut/protos/validation_test.pb.h> +#include <ydb/public/lib/validation/ut/protos/validation_test.pb.h> #include <library/cpp/testing/unittest/registar.h> diff --git a/ydb/core/grpc_services/validation/ut/CMakeLists.darwin.txt b/ydb/public/lib/validation/ut/CMakeLists.darwin.txt index 387c901012..301f0b6b44 100644 --- a/ydb/core/grpc_services/validation/ut/CMakeLists.darwin.txt +++ b/ydb/public/lib/validation/ut/CMakeLists.darwin.txt @@ -7,11 +7,11 @@ -add_executable(ydb-core-grpc_services-validation-ut) -target_include_directories(ydb-core-grpc_services-validation-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation +add_executable(ydb-public-lib-validation-ut) +target_include_directories(ydb-public-lib-validation-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation ) -target_link_libraries(ydb-core-grpc_services-validation-ut PUBLIC +target_link_libraries(ydb-public-lib-validation-ut PUBLIC contrib-libs-cxxsupp yutil library-cpp-cpuid_check @@ -19,25 +19,25 @@ target_link_libraries(ydb-core-grpc_services-validation-ut PUBLIC cpp-testing-unittest validation-ut-protos ) -target_sources(ydb-core-grpc_services-validation-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/ut.cpp +target_sources(ydb-public-lib-validation-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/ut.cpp ) add_test( NAME - ydb-core-grpc_services-validation-ut + ydb-public-lib-validation-ut COMMAND - ydb-core-grpc_services-validation-ut + ydb-public-lib-validation-ut --print-before-suite --print-before-test --fork-tests --print-times --show-fails ) -target_link_flags(ydb-core-grpc_services-validation-ut +target_link_flags(ydb-public-lib-validation-ut PUBLIC -Wl,-no_deduplicate -Wl,-sdk_version,10.15 -fPIC -fPIC ) -vcs_info(ydb-core-grpc_services-validation-ut) +vcs_info(ydb-public-lib-validation-ut) diff --git a/ydb/core/grpc_services/validation/ut/CMakeLists.linux.txt b/ydb/public/lib/validation/ut/CMakeLists.linux.txt index 70065eda7a..1d7da7e31d 100644 --- a/ydb/core/grpc_services/validation/ut/CMakeLists.linux.txt +++ b/ydb/public/lib/validation/ut/CMakeLists.linux.txt @@ -7,11 +7,11 @@ -add_executable(ydb-core-grpc_services-validation-ut) -target_include_directories(ydb-core-grpc_services-validation-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation +add_executable(ydb-public-lib-validation-ut) +target_include_directories(ydb-public-lib-validation-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation ) -target_link_libraries(ydb-core-grpc_services-validation-ut PUBLIC +target_link_libraries(ydb-public-lib-validation-ut PUBLIC contrib-libs-cxxsupp yutil library-cpp-lfalloc @@ -20,21 +20,21 @@ target_link_libraries(ydb-core-grpc_services-validation-ut PUBLIC cpp-testing-unittest validation-ut-protos ) -target_sources(ydb-core-grpc_services-validation-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/ut.cpp +target_sources(ydb-public-lib-validation-ut PRIVATE + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/ut.cpp ) add_test( NAME - ydb-core-grpc_services-validation-ut + ydb-public-lib-validation-ut COMMAND - ydb-core-grpc_services-validation-ut + ydb-public-lib-validation-ut --print-before-suite --print-before-test --fork-tests --print-times --show-fails ) -target_link_flags(ydb-core-grpc_services-validation-ut +target_link_flags(ydb-public-lib-validation-ut PUBLIC -ldl -lrt @@ -45,4 +45,4 @@ target_link_flags(ydb-core-grpc_services-validation-ut -lrt -ldl ) -vcs_info(ydb-core-grpc_services-validation-ut) +vcs_info(ydb-public-lib-validation-ut) diff --git a/ydb/core/grpc_services/validation/ut/CMakeLists.txt b/ydb/public/lib/validation/ut/CMakeLists.txt index a681d385f3..a681d385f3 100644 --- a/ydb/core/grpc_services/validation/ut/CMakeLists.txt +++ b/ydb/public/lib/validation/ut/CMakeLists.txt diff --git a/ydb/core/grpc_services/validation/ut/protos/CMakeLists.txt b/ydb/public/lib/validation/ut/protos/CMakeLists.txt index 5130b88a51..8e1de0c27f 100644 --- a/ydb/core/grpc_services/validation/ut/protos/CMakeLists.txt +++ b/ydb/public/lib/validation/ut/protos/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(validation-ut-protos PUBLIC contrib-libs-protobuf ) target_proto_messages(validation-ut-protos PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/grpc_services/validation/ut/protos/validation_test.proto + ${CMAKE_SOURCE_DIR}/ydb/public/lib/validation/ut/protos/validation_test.proto ) target_proto_plugin(validation-ut-protos validation diff --git a/ydb/core/grpc_services/validation/ut/protos/validation_test.proto b/ydb/public/lib/validation/ut/protos/validation_test.proto index f2c26ab388..f2c26ab388 100644 --- a/ydb/core/grpc_services/validation/ut/protos/validation_test.proto +++ b/ydb/public/lib/validation/ut/protos/validation_test.proto |