diff options
author | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-06-07 16:04:07 +0300 |
---|---|---|
committer | serg-belyakov <serg-belyakov@yandex-team.com> | 2023-06-07 16:04:07 +0300 |
commit | 7a59070e00e0d9797de00bcc5e0afa9b4acff73e (patch) | |
tree | 9aa727ba9c230ed4a32422ef8f8183286b7b2e9a | |
parent | 668b4b0738d0884b52e9212ea4ea1b78e5056937 (diff) | |
download | ydb-7a59070e00e0d9797de00bcc5e0afa9b4acff73e.tar.gz |
Add separate file for version control UT helper to use it in other tests,
Add separate file for version control UT helper to use it in other tests
-rw-r--r-- | ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt | 7 | ||||
-rw-r--r-- | ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt | 7 | ||||
-rw-r--r-- | ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt | 7 | ||||
-rw-r--r-- | ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt | 7 | ||||
-rw-r--r-- | ydb/core/driver_lib/version/ut/ut_helpers.h | 10 | ||||
-rw-r--r-- | ydb/core/driver_lib/version/ut/version_ut.cpp (renamed from ydb/core/driver_lib/version/version_ut.cpp) | 12 |
6 files changed, 32 insertions, 18 deletions
diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt index f39d13134fb..bf3aad7446d 100644 --- a/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt +++ b/ydb/core/driver_lib/version/ut/CMakeLists.darwin-x86_64.txt @@ -17,7 +17,10 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC library-cpp-cpuid_check cpp-testing-unittest_main version - yql-sql-pg_dummy + contrib-libs-protobuf + cpp-actors-interconnect + library-cpp-svnversion + ydb-core-protos ) target_link_options(ydb-core-driver_lib-version-ut PRIVATE -Wl,-platform_version,macos,11.0,11.0 @@ -27,7 +30,7 @@ target_link_options(ydb-core-driver_lib-version-ut PRIVATE CoreFoundation ) target_sources(ydb-core-driver_lib-version-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/ut/version_ut.cpp ) set_property( TARGET diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt index bb4e58b45c7..34048705cb6 100644 --- a/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt +++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-aarch64.txt @@ -17,7 +17,10 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC yutil cpp-testing-unittest_main version - yql-sql-pg_dummy + contrib-libs-protobuf + cpp-actors-interconnect + library-cpp-svnversion + ydb-core-protos ) target_link_options(ydb-core-driver_lib-version-ut PRIVATE -ldl @@ -30,7 +33,7 @@ target_link_options(ydb-core-driver_lib-version-ut PRIVATE -ldl ) target_sources(ydb-core-driver_lib-version-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/ut/version_ut.cpp ) set_property( TARGET diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt index d66731a83d4..609e9ec0e28 100644 --- a/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt +++ b/ydb/core/driver_lib/version/ut/CMakeLists.linux-x86_64.txt @@ -18,7 +18,10 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC library-cpp-cpuid_check cpp-testing-unittest_main version - yql-sql-pg_dummy + contrib-libs-protobuf + cpp-actors-interconnect + library-cpp-svnversion + ydb-core-protos ) target_link_options(ydb-core-driver_lib-version-ut PRIVATE -ldl @@ -31,7 +34,7 @@ target_link_options(ydb-core-driver_lib-version-ut PRIVATE -ldl ) target_sources(ydb-core-driver_lib-version-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/ut/version_ut.cpp ) set_property( TARGET diff --git a/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt b/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt index 75f82975de6..2662eede47a 100644 --- a/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt +++ b/ydb/core/driver_lib/version/ut/CMakeLists.windows-x86_64.txt @@ -17,10 +17,13 @@ target_link_libraries(ydb-core-driver_lib-version-ut PUBLIC library-cpp-cpuid_check cpp-testing-unittest_main version - yql-sql-pg_dummy + contrib-libs-protobuf + cpp-actors-interconnect + library-cpp-svnversion + ydb-core-protos ) target_sources(ydb-core-driver_lib-version-ut PRIVATE - ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/version_ut.cpp + ${CMAKE_SOURCE_DIR}/ydb/core/driver_lib/version/ut/version_ut.cpp ) set_property( TARGET diff --git a/ydb/core/driver_lib/version/ut/ut_helpers.h b/ydb/core/driver_lib/version/ut/ut_helpers.h new file mode 100644 index 00000000000..ac52a1e73ec --- /dev/null +++ b/ydb/core/driver_lib/version/ut/ut_helpers.h @@ -0,0 +1,10 @@ +#include <ydb/core/driver_lib/version/version.h> + +class TCompatibilityInfoTest { +public: + TCompatibilityInfoTest() = delete; + + static void Reset(NKikimrConfig::TCurrentCompatibilityInfo* newCurrent) { + TCompatibilityInfo::Reset(newCurrent); + } +}; diff --git a/ydb/core/driver_lib/version/version_ut.cpp b/ydb/core/driver_lib/version/ut/version_ut.cpp index f77e6b1de57..3674b1130fb 100644 --- a/ydb/core/driver_lib/version/version_ut.cpp +++ b/ydb/core/driver_lib/version/ut/version_ut.cpp @@ -1,14 +1,6 @@ #include <library/cpp/testing/unittest/registar.h> -#include "version.h" - -class TCompatibilityInfoTest { -public: - TCompatibilityInfoTest() = delete; - - static void Reset(NKikimrConfig::TCurrentCompatibilityInfo* newCurrent) { - TCompatibilityInfo::Reset(newCurrent); - } -}; +#include <ydb/core/driver_lib/version/version.h> +#include "ut_helpers.h" Y_UNIT_TEST_SUITE(VersionParser) { Y_UNIT_TEST(Basic) { |