diff options
Diffstat (limited to 'lldb/test')
11 files changed, 37 insertions, 42 deletions
diff --git a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py index ab45d449d35..bf24e9e1285 100644 --- a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py +++ b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py @@ -38,10 +38,10 @@ class PersistenttypesTestCase(TestBase): self.runCmd("next") self.expect("memory read foo -t $foobar", - substrs = ['($foobar) 0x', ' = {', "a = 'H'","b = 'e'","c = 'l'","d = 'l'"]) # persistent types are OK to use for memory read + substrs = ['($foobar) 0x', ' = ', "a = 'H'","b = 'e'","c = 'l'","d = 'l'"]) # persistent types are OK to use for memory read self.expect("memory read foo -t foobar", - substrs = ['($foobar) 0x', ' = {', "a = 'H'","b = 'e'","c = 'l'","d = 'l'"],matching=False,error=True) # the type name is $foobar, make sure we settle for nothing less + substrs = ['($foobar) 0x', ' = ', "a = 'H'","b = 'e'","c = 'l'","d = 'l'"],matching=False,error=True) # the type name is $foobar, make sure we settle for nothing less if __name__ == '__main__': diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py index 01e738adddb..935673cb7ad 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py @@ -178,7 +178,7 @@ class AdvDataFormatterTestCase(TestBase): # if the summary has an error, we still display the value self.expect("frame variable couple --summary-string \"${*var.sp.foo[0-2]\"", - substrs = ['(Couple) couple = {','sp = {','z =','"X"']) + substrs = ['(Couple) couple = (sp = SimpleWithPointers @ 0x', 's = 0x',')']) self.runCmd("type summary add --summary-string \"${*var.sp.x[0-2]} are low bits of integer ${*var.sp.x}. If I pretend it is an array I get ${var.sp.x[0-5]}\" Couple") diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py index 29ab2e9671e..389a5e06e60 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -292,7 +292,7 @@ class CategoriesDataFormatterTestCase(TestBase): self.expect("frame variable c1 r1 c_ptr r_ptr", substrs = ['ACircle', - '(Rectangle) r1 = {', 'w = 5', 'h = 6', + '(Rectangle) r1 = ', 'w = 5', 'h = 6', 'ACircle', 'ARectangleStar']) diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index 2d5f2965f02..a093b8844d8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -297,7 +297,7 @@ class ObjCDataFormatterTestCase(TestBase): self.runCmd("type summary add --summary-string \"a test\" MyClass") self.expect("frame variable *object2", - substrs = ['*object2 = {', + substrs = ['*object2 =', 'MyClass = a test', 'backup = ']); diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py index baf3f2d244b..2c203f647ec 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -158,9 +158,7 @@ class SkipSummaryDataFormatterTestCase(TestBase): self.expect('frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=2', substrs = ['(DeepData_5) data1.m_child1->m_child2.m_child1.m_child2 = {', 'm_some_text = {', - '_M_dataplus = {', - '_M_p = 0x', - '"Just a test"']) + '_M_dataplus = (_M_p = "Just a test")']) # Repeat the above, but only skip 1 level of summaries self.expect('frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=1', diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py index ce5f0f2b690..a4668b5cfac 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py @@ -68,10 +68,10 @@ class LibcxxMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['size=2', - '[0] = {', + '[0] = ', 'first = 0', 'second = 0', - '[1] = {', + '[1] = ', 'first = 1', 'second = 1']) @@ -79,10 +79,10 @@ class LibcxxMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['size=4', - '[2] = {', + '[2] = ', 'first = 2', 'second = 0', - '[3] = {', + '[3] = ', 'first = 3', 'second = 1']) @@ -90,19 +90,19 @@ class LibcxxMapDataFormatterTestCase(TestBase): self.expect("frame variable ii", substrs = ['size=8', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) self.expect("p ii", substrs = ['size=8', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py index ec450e1b024..6e75fc20501 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py @@ -67,10 +67,10 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['size=2', - '[0] = {', + '[0] = ', 'first = 0', 'second = 0', - '[1] = {', + '[1] = ', 'first = 1', 'second = 1']) @@ -78,10 +78,10 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['size=4', - '[2] = {', + '[2] = ', 'first = 2', 'second = 0', - '[3] = {', + '[3] = ', 'first = 3', 'second = 1']) @@ -89,19 +89,19 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): self.expect("frame variable ii", substrs = ['size=8', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) self.expect("p ii", substrs = ['size=8', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py index e64e9b7cf04..1b0cc815802 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py @@ -74,10 +74,10 @@ class StdMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['map has 2 items', - '[0] = {', + '[0] = ', 'first = 0', 'second = 0', - '[1] = {', + '[1] = ', 'first = 1', 'second = 1']) @@ -85,10 +85,10 @@ class StdMapDataFormatterTestCase(TestBase): self.expect('frame variable ii', substrs = ['map has 4 items', - '[2] = {', + '[2] = ', 'first = 2', 'second = 0', - '[3] = {', + '[3] = ', 'first = 3', 'second = 1']) @@ -96,19 +96,19 @@ class StdMapDataFormatterTestCase(TestBase): self.expect("frame variable ii", substrs = ['map has 9 items', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) self.expect("p ii", substrs = ['map has 9 items', - '[5] = {', + '[5] = ', 'first = 5', 'second = 0', - '[7] = {', + '[7] = ', 'first = 7', 'second = 1']) diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py index 0a85da7b529..38226ca14da 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py +++ b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py @@ -62,17 +62,17 @@ class DataFormatterRdar11988289TestCase(TestBase): self.expect('frame variable mutabledict', substrs = ['4 key/value pairs']) self.expect('frame variable dictionary --ptr-depth 1', - substrs = ['3 key/value pairs','[0] = {','key = 0x','value = 0x','[1] = {','[2] = {']) + substrs = ['3 key/value pairs','[0] = ','key = 0x','value = 0x','[1] = ','[2] = ']) self.expect('frame variable mutabledict --ptr-depth 1', - substrs = ['4 key/value pairs','[0] = {','key = 0x','value = 0x','[1] = {','[2] = {','[3] = {']) + substrs = ['4 key/value pairs','[0] = ','key = 0x','value = 0x','[1] = ','[2] = ','[3] = ']) self.expect('frame variable dictionary --ptr-depth 1 --dynamic-type no-run-target', substrs = ['3 key/value pairs','@"bar"','@"2 objects"','@"baz"','2 key/value pairs']) self.expect('frame variable mutabledict --ptr-depth 1 --dynamic-type no-run-target', substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"puartist"','3 key/value pairs']) self.expect('frame variable mutabledict --ptr-depth 2 --dynamic-type no-run-target', - substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"puartist"','3 key/value pairs {','@"bar"','@"2 objects"']) + substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"puartist"','3 key/value pairs','@"bar"','@"2 objects"']) self.expect('frame variable mutabledict --ptr-depth 3 --dynamic-type no-run-target', - substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"puartist"','3 key/value pairs {','@"bar"','@"2 objects"','(int)1','@"two"']) + substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"puartist"','3 key/value pairs','@"bar"','@"2 objects"','(int)1','@"two"']) self.assertTrue(self.frame().FindVariable("dictionary").MightHaveChildren(), "dictionary says it does not have children!") self.assertTrue(self.frame().FindVariable("mutabledict").MightHaveChildren(), "mutable says it does not have children!") diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py index 6f68df96106..e65cb8b3d5c 100644 --- a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py +++ b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py @@ -55,7 +55,7 @@ class Radar13338477DataFormatterTestCase(TestBase): self.addTearDownHook(cleanup) self.expect('p *(int (*)[3])foo', - substrs = ['(int [3]) $',' = {','[0] = 1','[1] = 2','[2] = 3']) + substrs = ['(int [3]) $','[0] = 1','[1] = 2','[2] = 3']) self.expect('p *(int (*)[3])foo', matching=False, substrs = ['01 00 00 00 02 00 00 00 03 00 00 00']) diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/lang/c/anonymous/TestAnonymous.py index 0bef5bff3f6..d86c31e1e59 100644 --- a/lldb/test/lang/c/anonymous/TestAnonymous.py +++ b/lldb/test/lang/c/anonymous/TestAnonymous.py @@ -130,13 +130,10 @@ class AnonymousTestCase(TestBase): # These should display correctly. self.expect("expression pz", VARIABLES_DISPLAYED_CORRECTLY, - substrs = ["(type_z *) $0 = 0x0000"]) + substrs = ["(type_z *) $", " = 0x0000"]) self.expect("expression z.y", VARIABLES_DISPLAYED_CORRECTLY, - substrs = ["(type_y) $1 = {"]) - - self.expect("expression z", VARIABLES_DISPLAYED_CORRECTLY, - substrs = ["dummy = 2"]) + substrs = ["(type_y) $", "dummy = 2"]) def expr_null(self): self.common_setup(self.line2) |
