diff options
| author | Enrico Granata <egranata@apple.com> | 2015-09-17 00:14:50 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2015-09-17 00:14:50 +0000 |
| commit | fa6b278f9ca65c0c8a345d7fcad7392f5779be08 (patch) | |
| tree | ddd54a5ba12f6f414a688b185870e0cbf410d95b /lldb/test/functionalities/data-formatter | |
| parent | bf8f00586a8627eb9bfe71771a58cdca5a7af5da (diff) | |
| download | bcm5719-llvm-fa6b278f9ca65c0c8a345d7fcad7392f5779be08.tar.gz bcm5719-llvm-fa6b278f9ca65c0c8a345d7fcad7392f5779be08.zip | |
Add the ability for formatter categories to be bound to one or more languages
What that does is it restricts formatters in those categories to only match to types coming from "compatible" source languages
llvm-svn: 247872
Diffstat (limited to 'lldb/test/functionalities/data-formatter')
2 files changed, 7 insertions, 9 deletions
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 76de9a7245e..299e3222d4a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -159,8 +159,6 @@ class CategoriesDataFormatterTestCase(TestBase): self.runCmd("type summary add Rectangle -w Category1 --summary-string \"Category1\"") self.runCmd("type summary add Rectangle -w Category2 --summary-string \"Category2\"") - self.runCmd("type category list") - self.runCmd("type category enable Category2") self.runCmd("type category enable Category1") @@ -302,7 +300,7 @@ class CategoriesDataFormatterTestCase(TestBase): # check that list commands work self.expect("type category list", - substrs = ['RectangleStarCategory is enabled']) + substrs = ['RectangleStarCategory (enabled)']) self.expect("type summary list", substrs = ['ARectangleStar']) @@ -312,7 +310,7 @@ class CategoriesDataFormatterTestCase(TestBase): # check that list commands work self.expect("type category list", - substrs = ['CircleCategory is not enabled']) + substrs = ['CircleCategory (disabled']) self.expect("frame variable c1 r_ptr", substrs = ['AShape', diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py index e12dfad32b5..25cea2a0b01 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -55,7 +55,7 @@ class DataFormatterDisablingTestCase(TestBase): #self.runCmd('type category enable system VectorTypes libcxx gnu-libstdc++ CoreGraphics CoreServices AppKit CoreFoundation objc default', check=False) - self.expect('type category list', substrs = ['system is enabled',]) + self.expect('type category list', substrs = ['system','enabled',]) self.expect("frame variable numbers", substrs = ['[0] = 1', '[3] = 1234']) @@ -70,23 +70,23 @@ class DataFormatterDisablingTestCase(TestBase): self.expect('frame variable string1', matching=False, substrs = ['hello world']) - self.expect('type category list', substrs = ['system is not enabled',]) + self.expect('type category list', substrs = ['system','disabled',]) # now enable and check that we are back to normal self.runCmd("type category enable *") - self.expect('type category list', substrs = ['system is enabled']) + self.expect('type category list', substrs = ['system','enabled']) self.expect("frame variable numbers", substrs = ['[0] = 1', '[3] = 1234']) self.expect('frame variable string1', substrs = ['hello world']) - self.expect('type category list', substrs = ['system is enabled']) + self.expect('type category list', substrs = ['system','enabled']) # last check - our cleanup will re-enable everything self.runCmd('type category disable *') - self.expect('type category list', substrs = ['system is not enabled']) + self.expect('type category list', substrs = ['system','disabled']) if __name__ == '__main__': |
