diff options
| author | dtorilov <dtorilov@yandex-team.com> | 2024-03-27 22:11:00 +0300 |
|---|---|---|
| committer | dtorilov <dtorilov@yandex-team.com> | 2024-03-27 22:22:53 +0300 |
| commit | 1541ebf4e489185a3ec0d47a2ea8e474522af784 (patch) | |
| tree | ede807c00af640aa49309701d98b496a4d46859c /util/system | |
| parent | 0a9f70229b9ddccbd4a09d389642ddafcbe8fd57 (diff) | |
| download | ydb-1541ebf4e489185a3ec0d47a2ea8e474522af784.tar.gz | |
Update libcxxabi to 16.0.6
0a9e5a8cb8cd8cd03641221da29e1186a61cf984
Diffstat (limited to 'util/system')
| -rw-r--r-- | util/system/type_name_ut.cpp | 12 | ||||
| -rw-r--r-- | util/system/ut/ya.make | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/util/system/type_name_ut.cpp b/util/system/type_name_ut.cpp index 86597f4232..c9b2a1e775 100644 --- a/util/system/type_name_ut.cpp +++ b/util/system/type_name_ut.cpp @@ -67,10 +67,10 @@ Y_UNIT_TEST_SUITE(TypeName) { UNIT_ASSERT_VALUES_EQUAL(TypeName<double>(), "double"); #ifdef _MSC_VER - UNIT_ASSERT_VALUES_EQUAL(TypeName<std::string>(), "class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName<std::string>(), "class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char>>"); UNIT_ASSERT_VALUES_EQUAL(TypeName<std::runtime_error>(), "class std::runtime_error"); #else - UNIT_ASSERT_VALUES_EQUAL(TypeName<std::string>(), "std::basic_string<char, std::char_traits<char>, std::allocator<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName<std::string>(), "std::basic_string<char, std::char_traits<char>, std::allocator<char>>"); UNIT_ASSERT_VALUES_EQUAL(TypeName<std::runtime_error>(), "std::runtime_error"); #endif } @@ -78,10 +78,10 @@ Y_UNIT_TEST_SUITE(TypeName) { Y_UNIT_TEST(FromArcadiaTypes) { #ifdef _MSC_VER UNIT_ASSERT_VALUES_EQUAL(TypeName<yexception>(), "class yexception"); - UNIT_ASSERT_VALUES_EQUAL(TypeName<TString>(), "class TBasicString<char,struct std::char_traits<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName<TString>(), "class TBasicString<char,struct std::char_traits<char>>"); #else UNIT_ASSERT_VALUES_EQUAL(TypeName<yexception>(), "yexception"); - UNIT_ASSERT_VALUES_EQUAL(TypeName<TString>(), "TBasicString<char, std::char_traits<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName<TString>(), "TBasicString<char, std::char_traits<char>>"); #endif } @@ -122,10 +122,10 @@ Y_UNIT_TEST_SUITE(TypeName) { std::string string; std::runtime_error err("This is awful"); #ifdef _MSC_VER - UNIT_ASSERT_VALUES_EQUAL(TypeName(string), "class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName(string), "class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char>>"); UNIT_ASSERT_VALUES_EQUAL(TypeName(err), "class std::runtime_error"); #else - UNIT_ASSERT_VALUES_EQUAL(TypeName(string), "std::basic_string<char, std::char_traits<char>, std::allocator<char> >"); + UNIT_ASSERT_VALUES_EQUAL(TypeName(string), "std::basic_string<char, std::char_traits<char>, std::allocator<char>>"); UNIT_ASSERT_VALUES_EQUAL(TypeName(err), "std::runtime_error"); #endif } diff --git a/util/system/ut/ya.make b/util/system/ut/ya.make index f69ca701e5..b6c0512caa 100644 --- a/util/system/ut/ya.make +++ b/util/system/ut/ya.make @@ -71,12 +71,17 @@ SRCS( system/thread_ut.cpp system/tls_ut.cpp system/types_ut.cpp - system/type_name_ut.cpp system/user_ut.cpp system/unaligned_mem_ut.cpp system/yassert_ut.cpp ) +IF (NOT USE_STL_SYSTEM) + SRCS( + system/type_name_ut.cpp + ) +ENDIF() + IF (OS_WINDOWS) SRCS( system/fs_win_ut.cpp |