Author: Michael Buch Date: 2023-08-10T19:48:44+01:00 New Revision: 487ab39a5082098f92e886de606505f25031a22a
URL: https://github.com/llvm/llvm-project/commit/487ab39a5082098f92e886de606505f25031a22a DIFF: https://github.com/llvm/llvm-project/commit/487ab39a5082098f92e886de606505f25031a22a.diff LOG: [lldb][test] Remove tests relying on deprecated std::char_traits specializations (motivated by test failures after D157058) With D157058 the base template for `std::char_traits` was removed from libc++. Quoting the release notes: ``` The base template for ``std::char_traits`` has been removed. If you are using ``std::char_traits`` with types other than ``char``, ``wchar_t``, ``char8_t``, ``char16_t``, ``char32_t`` or a custom character type for which you specialized ``std::char_traits``, your code will no longer work. ``` This patch simply removes all such instantiations to make sure the tests that run against the latest libc++ version pass. One could try testing the existence of this base template from within the test source files but this doesn't seem like something we want support. Differential Revision: https://reviews.llvm.org/D157636 Added: Modified: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp Removed: ################################################################################ diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py index 16f93bc8acb0ee..e2d2e67f1e885e 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -50,16 +50,6 @@ def cleanup(): ns = self.namespace - if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion( - [">", "16.0"] - ): - expected_basic_string = "%s::basic_string<unsigned char>" % ns - else: - expected_basic_string = ( - "%s::basic_string<unsigned char, %s::char_traits<unsigned char>, " - "%s::allocator<unsigned char> >" % (ns, ns, ns) - ) - self.expect( "frame variable", substrs=[ @@ -81,7 +71,6 @@ def cleanup(): '(%s::u32string) u32_string = U"🍄🍅🍆🍌"' % ns, # FIXME: This should have a 'U' prefix. '(%s::u32string) u32_empty = ""' % ns, - '(%s) uchar = "aaaaa"' % expected_basic_string, "(%s::string *) null_str = nullptr" % ns, ], ) @@ -126,7 +115,6 @@ def cleanup(): '(%s::u16string) u16_string = u"ß水氶"' % ns, '(%s::u32string) u32_string = U"🍄🍅🍆🍌"' % ns, '(%s::u32string) u32_empty = ""' % ns, - '(%s) uchar = "aaaaa"' % expected_basic_string, "(%s::string *) null_str = nullptr" % ns, ], ) diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp index 02c55487c41d27..f9f1c0802e5189 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp @@ -113,7 +113,6 @@ int main() std::u16string u16_empty(u""); std::u32string u32_string(U"🍄🍅🍆🍌"); std::u32string u32_empty(U""); - std::basic_string<unsigned char> uchar(5, 'a'); std::string *null_str = nullptr; std::string garbage1, garbage2, garbage3, garbage4, garbage5; diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py index 6a77358b9bd2bf..660eb09db20da2 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py @@ -60,15 +60,6 @@ def cleanup(): # Execute the cleanup function during test case tear down. self.addTearDownHook(cleanup) - if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion( - [">", "16.0"] - ): - expected_basic_string = "std::basic_string<unsigned char>" - expected_basic_string_view = "std::basic_string_view<unsigned char>" - else: - expected_basic_string = "std::basic_string<unsigned char, std::char_traits<unsigned char>, std::allocator<unsigned char> >" - expected_basic_string_view = "std::basic_string_view<unsigned char, std::char_traits<unsigned char> >" - self.expect_var_path("wempty", type="std::wstring_view", summary='L""') self.expect_var_path( "s", type="std::wstring_view", summary='L"hello world! מזל טוב!"' @@ -96,12 +87,6 @@ def cleanup(): "u32_string", type="std::u32string_view", summary='U"🍄🍅🍆🍌"' ) self.expect_var_path("u32_empty", type="std::u32string_view", summary='""') - self.expect_var_path( - "uchar_source", type=expected_basic_string, summary='"aaaaaaaaaa"' - ) - self.expect_var_path( - "uchar", type=expected_basic_string_view, summary='"aaaaa"' - ) self.expect_var_path( "oops", type="std::string_view", summary='"Hellooo World\\n"' ) @@ -166,12 +151,6 @@ def cleanup(): "u32_string", type="std::u32string_view", summary='U"🍄🍅🍆🍌"' ) self.expect_var_path("u32_empty", type="std::u32string_view", summary='""') - self.expect_var_path( - "uchar_source", type=expected_basic_string, summary='"aaaaaaaaaa"' - ) - self.expect_var_path( - "uchar", type=expected_basic_string_view, summary='"aaaaa"' - ) self.runCmd("cont") self.expect( diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp index 3e0360ff7ca5a7..1e164786bc1a9a 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp @@ -92,8 +92,6 @@ int main() { std::u16string_view u16_empty(u""); std::u32string_view u32_string(U"🍄🍅🍆🍌"); std::u32string_view u32_empty(U""); - std::basic_string<unsigned char> uchar_source(10, 'a'); - std::basic_string_view<unsigned char> uchar(uchar_source.data(), 5); std::string_view *null_str = nullptr; std::string hello = "Hellooo "; diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py index cc099b4341c3c1..0b78fb7dc3911c 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -61,8 +61,6 @@ def cleanup(): var_pq = self.frame().FindVariable("pq") var_pQ = self.frame().FindVariable("pQ") - var_uchar = self.frame().FindVariable("uchar") - self.assertEqual(var_wempty.GetSummary(), 'L""', "wempty summary wrong") self.assertEqual( var_s.GetSummary(), 'L"hello world! מזל טוב!"', "s summary wrong" @@ -78,7 +76,6 @@ def cleanup(): '"quite a long std::strin with lots of info inside it"', "Q summary wrong", ) - self.assertEqual(var_uchar.GetSummary(), '"aaaaa"', "u summary wrong") self.assertEqual(var_rq.GetSummary(), '"hello world"', "rq summary wrong") self.assertEqual( var_rQ.GetSummary(), diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp index 930f8c2afef212..eefb96c4573e4e 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp @@ -9,7 +9,6 @@ int main() std::string empty(""); std::string q("hello world"); std::string Q("quite a long std::strin with lots of info inside it"); - std::basic_string<unsigned char> uchar(5, 'a'); auto &rq = q, &rQ = Q; std::string *pq = &q, *pQ = &Q; S.assign(L"!!!!!"); // Set break point at this line. _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
