diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
4 files changed, 26 insertions, 16 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py index f36876ad51a..050d3afceb1 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -74,8 +74,10 @@ class LibcxxStringDataFormatterTestCase(TestBase): '(%s::u16string) u16_empty = ""'%ns, '(%s::u32string) u32_string = U"đđ
đđ"'%ns, # FIXME: This should have a 'U' prefix. - '(%s::u32string) u32_empty = ""'%ns -]) + '(%s::u32string) u32_empty = ""'%ns, + '(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, ' + '%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns), + ]) self.runCmd("n") @@ -107,4 +109,8 @@ class LibcxxStringDataFormatterTestCase(TestBase): '(%s::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns, '(%s::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ăŠă ă«ăäšăă §æ§ ăă
ăžçŠç©€è„© ăă銩ăȘ㧠䀊çŁ"'%ns, '(%s::u16string) u16_string = u"Ăæ°Žæ°¶"'%ns, - '(%s::u32string) u32_string = U"đđ
đđ"'%ns]) + '(%s::u32string) u32_string = U"đđ
đđ"'%ns, + '(%s::u32string) u32_empty = ""'%ns, + '(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, ' + '%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns), + ]) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp index ec9b8170b2f..afb56e67f0a 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp @@ -16,6 +16,7 @@ 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'); S.assign(L"!!!!!"); // Set break point at this line. return 0; } diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py index 0adbaa91d6f..72434faa34f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -59,26 +59,28 @@ class StdStringDataFormatterTestCase(TestBase): var_empty = self.frame().FindVariable('empty') var_q = self.frame().FindVariable('q') var_Q = self.frame().FindVariable('Q') + var_uchar = self.frame().FindVariable('uchar') # TODO: This is currently broken - # self.assertTrue(var_wempty.GetSummary() == 'L""', "wempty summary wrong") - self.assertTrue( - var_s.GetSummary() == 'L"hello world! ŚŚŚ ŚŚŚ!"', + # self.assertEqual(var_wempty.GetSummary(), 'L""', "wempty summary wrong") + self.assertEqual( + var_s.GetSummary(), 'L"hello world! ŚŚŚ ŚŚŚ!"', "s summary wrong") - self.assertTrue(var_S.GetSummary() == 'L"!!!!"', "S summary wrong") - self.assertTrue( - var_mazeltov.GetSummary() == 'L"ŚŚŚ ŚŚŚ"', + self.assertEqual(var_S.GetSummary(), 'L"!!!!"', "S summary wrong") + self.assertEqual( + var_mazeltov.GetSummary(), 'L"ŚŚŚ ŚŚŚ"', "mazeltov summary wrong") - self.assertTrue(var_empty.GetSummary() == '""', "empty summary wrong") - self.assertTrue( - var_q.GetSummary() == '"hello world"', + self.assertEqual(var_empty.GetSummary(), '""', "empty summary wrong") + self.assertEqual( + var_q.GetSummary(), '"hello world"', "q summary wrong") - self.assertTrue( - var_Q.GetSummary() == '"quite a long std::strin with lots of info inside it"', + self.assertEqual( + var_Q.GetSummary(), '"quite a long std::strin with lots of info inside it"', "Q summary wrong") + self.assertEqual(var_uchar.GetSummary(), '"aaaaa"', "u summary wrong") self.runCmd("next") - self.assertTrue( - var_S.GetSummary() == 'L"!!!!!"', + self.assertEqual( + var_S.GetSummary(), 'L"!!!!!"', "new S summary wrong") diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp index 6227a4d493a..73519197d8c 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp @@ -9,6 +9,7 @@ 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'); S.assign(L"!!!!!"); // Set break point at this line. return 0; } |
