Awesome, thanks so much Enrico! On Tue, Aug 25, 2015 at 4:56 PM Enrico Granata via lldb-commits < lldb-commits@lists.llvm.org> wrote:
> Author: enrico > Date: Tue Aug 25 18:55:10 2015 > New Revision: 245993 > > URL: http://llvm.org/viewvc/llvm-project?rev=245993&view=rev > Log: > Rename all functionalities/data-formatter test case with radar bug numbers > in them to more meaningful names > > > Added: > lldb/trunk/test/functionalities/data-formatter/boolreference/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11773899/ > lldb/trunk/test/functionalities/data-formatter/compactvectors/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10642615/ > > lldb/trunk/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py > > lldb/trunk/test/functionalities/data-formatter/data-formatter-proper-plurals/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-3534688/ > > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-13338477/ > > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py > lldb/trunk/test/functionalities/data-formatter/hexcaps/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10449092/ > > lldb/trunk/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11086338/ > > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11988289/ > > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar > 11988289.py > lldb/trunk/test/functionalities/data-formatter/nssetsynth/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12529957/ > > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py > lldb/trunk/test/functionalities/data-formatter/ostypeformatting/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11628688/ > lldb/trunk/test/functionalities/data-formatter/summary-string-onfail/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-9974002/ > lldb/trunk/test/functionalities/data-formatter/synthcapping/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10887661/ > > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py > lldb/trunk/test/functionalities/data-formatter/synthupdate/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12437442/ > > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/ > - copied from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-9973865/ > > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py > - copied, changed from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py > Removed: > > lldb/trunk/test/functionalities/data-formatter/compactvectors/Test-rdar-10642615.py > > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/Test-rdar-13338477.py > > lldb/trunk/test/functionalities/data-formatter/hexcaps/Test-rdar-10449092.py > > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestRdar11086338.py > > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestRdar > 11988289.py > > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestRdar12529957.py > lldb/trunk/test/functionalities/data-formatter/rdar-10449092/ > lldb/trunk/test/functionalities/data-formatter/rdar-10642615/ > lldb/trunk/test/functionalities/data-formatter/rdar-10887661/ > lldb/trunk/test/functionalities/data-formatter/rdar-11086338/ > lldb/trunk/test/functionalities/data-formatter/rdar-11628688/ > lldb/trunk/test/functionalities/data-formatter/rdar-11773899/ > lldb/trunk/test/functionalities/data-formatter/rdar-11988289/ > lldb/trunk/test/functionalities/data-formatter/rdar-12437442/ > lldb/trunk/test/functionalities/data-formatter/rdar-12529957/ > lldb/trunk/test/functionalities/data-formatter/rdar-13338477/ > lldb/trunk/test/functionalities/data-formatter/rdar-3534688/ > lldb/trunk/test/functionalities/data-formatter/rdar-9973865/ > lldb/trunk/test/functionalities/data-formatter/rdar-9973992/ > lldb/trunk/test/functionalities/data-formatter/rdar-9974002/ > > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestRdar10887661.py > > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestRdar12437442.py > > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/Test-rdar-9973865.py > Modified: > > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp > > Removed: > lldb/trunk/test/functionalities/data-formatter/compactvectors/Test-rdar-10642615.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/compactvectors/Test-rdar-10642615.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/compactvectors/Test-rdar-10642615.py > (removed) > @@ -1,74 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import lldbutil > - > -class Radar10642615DataFormatterTestCase(TestBase): > - > - # test for rdar://problem/10642615 () > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_with_dsym_and_run_command(self): > - """Test data formatter commands.""" > - self.buildDsym() > - self.data_formatter_commands() > - > - @skipUnlessDarwin > - @dwarf_test > - def test_with_dwarf_and_run_command(self): > - """Test data formatter commands.""" > - self.buildDwarf() > - self.data_formatter_commands() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.cpp', '// Set break point at this > line.') > - > - def data_formatter_commands(self): > - """Test that that file and class static variables display > correctly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type summary clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - self.expect('frame variable', > - substrs = ['(vFloat) valueFL = (1.25, 0, 0.25, 0)', > - '(int16_t [8]) valueI16 = (1, 0, 4, 0, 0, 1, 0, > 4)', > - '(int32_t [4]) valueI32 = (1, 0, 4, 0)', > - '(vDouble) valueDL = (1.25, 2.25)', > - '(vUInt8) valueU8 = (0x01, 0x00, 0x04, 0x00, 0x00, > 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)', > - '(vUInt16) valueU16 = (1, 0, 4, 0, 0, 1, 0, 4)', > - '(vUInt32) valueU32 = (1, 2, 3, 4)', > - "(vSInt8) valueS8 = (1, 0, 4, 0, 0, 1, 0, 4, 0, 0, > 0, 0, 0, 0, 0, 0)", > - '(vSInt16) valueS16 = (1, 0, 4, 0, 0, 1, 0, 4)', > - '(vSInt32) valueS32 = (4, 3, 2, 1)', > - '(vBool32) valueBool32 = (0, 1, 0, 1)']) > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py?p2=lldb/trunk/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py > Tue Aug 25 18:55:10 2015 > @@ -8,9 +8,8 @@ import lldb > from lldbtest import * > import lldbutil > > -class Radar10642615DataFormatterTestCase(TestBase): > +class CompactVectorsFormattingTestCase(TestBase): > > - # test for rdar://problem/10642615 () > mydir = TestBase.compute_mydir(__file__) > > @skipUnlessDarwin > > Removed: > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/Test-rdar-13338477.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/Test-rdar-13338477.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/Test-rdar-13338477.py > (removed) > @@ -1,70 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import lldbutil > - > -class Radar13338477DataFormatterTestCase(TestBase): > - > - # test for rdar://problem/13338477 () > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_with_dsym_and_run_command(self): > - """Test that LLDB handles the clang typeclass Paren correctly.""" > - self.buildDsym() > - self.data_formatter_commands() > - > - @dwarf_test > - def test_with_dwarf_and_run_command(self): > - """Test that LLDB handles the clang typeclass Paren correctly.""" > - self.buildDwarf() > - self.data_formatter_commands() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.cpp', '// Set break point at this > line.') > - > - def data_formatter_commands(self): > - """Test that LLDB handles the clang typeclass Paren correctly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format delete hex', check=False) > - self.runCmd('type summary clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - self.expect('p *(int (*)[3])foo', > - 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']) > - self.expect('p *(int (*)[3])foo', matching=False, > - substrs = ['0x000000030000000200000001']) > - > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py?p2=lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py > Tue Aug 25 18:55:10 2015 > @@ -8,9 +8,8 @@ import lldb > from lldbtest import * > import lldbutil > > -class Radar13338477DataFormatterTestCase(TestBase): > +class PtrToArrayDataFormatterTestCase(TestBase): > > - # test for rdar://problem/13338477 () > mydir = TestBase.compute_mydir(__file__) > > @skipUnlessDarwin > > Removed: > lldb/trunk/test/functionalities/data-formatter/hexcaps/Test-rdar-10449092.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/hexcaps/Test-rdar-10449092.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/hexcaps/Test-rdar-10449092.py > (removed) > @@ -1,99 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import lldbutil > - > -class Radar10449092DataFormatterTestCase(TestBase): > - > - # test for rdar://problem/10449092 () > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_with_dsym_and_run_command(self): > - """Test data formatter commands.""" > - self.buildDsym() > - self.data_formatter_commands() > - > - @dwarf_test > - def test_with_dwarf_and_run_command(self): > - """Test data formatter commands.""" > - self.buildDwarf() > - self.data_formatter_commands() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.cpp', '// Set break point at this > line.') > - > - def data_formatter_commands(self): > - """Test that that file and class static variables display > correctly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format delete hex', check=False) > - self.runCmd('type summary clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - self.runCmd("type format add -f uppercase int") > - > - self.expect('frame variable mine', > - substrs = ['mine = ', > - 'first = 0x001122AA', 'second = 0x1122BB44']) > - > - self.runCmd("type format add -f hex int") > - > - self.expect('frame variable mine', > - substrs = ['mine = ', > - 'first = 0x001122aa', 'second = 0x1122bb44']) > - > - self.runCmd("type format delete int") > - > - self.runCmd("type summary add -s \"${var.first%X} and > ${var.second%x}\" foo") > - > - self.expect('frame variable mine', > - substrs = ['(foo) mine = 0x001122AA and 0x1122bb44']) > - > - self.runCmd("type summary add -s \"${var.first%X} and > ${var.second%X}\" foo") > - self.runCmd("next") > - self.runCmd("next") > - self.expect('frame variable mine', > - substrs = ['(foo) mine = 0xAABBCCDD and 0x1122BB44']) > - > - self.runCmd("type summary add -s \"${var.first%x} and > ${var.second%X}\" foo") > - self.expect('frame variable mine', > - substrs = ['(foo) mine = 0xaabbccdd and 0x1122BB44']) > - self.runCmd("next") > - self.runCmd("next") > - self.runCmd("type summary add -s \"${var.first%x} and > ${var.second%x}\" foo") > - self.expect('frame variable mine', > - substrs = ['(foo) mine = 0xaabbccdd and 0xff00ff00']) > - self.runCmd("type summary add -s \"${var.first%X} and > ${var.second%X}\" foo") > - self.expect('frame variable mine', > - substrs = ['(foo) mine = 0xAABBCCDD and 0xFF00FF00']) > - > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py?p2=lldb/trunk/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py > Tue Aug 25 18:55:10 2015 > @@ -8,9 +8,8 @@ import lldb > from lldbtest import * > import lldbutil > > -class Radar10449092DataFormatterTestCase(TestBase): > +class DataFormatterHexCapsTestCase(TestBase): > > - # test for rdar://problem/10449092 () > mydir = TestBase.compute_mydir(__file__) > > @skipUnlessDarwin > > Copied: > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py?p2=lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py > Tue Aug 25 18:55:10 2015 > @@ -9,7 +9,7 @@ from lldbtest import * > import datetime > import lldbutil > > -class DataFormatterRdar11086338TestCase(TestBase): > +class NSArraySyntheticTestCase(TestBase): > > mydir = TestBase.compute_mydir(__file__) > > > Removed: > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestRdar11086338.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestRdar11086338.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nsarraysynth/TestRdar11086338.py > (removed) > @@ -1,83 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import datetime > -import lldbutil > - > -class DataFormatterRdar11086338TestCase(TestBase): > - > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_rdar11086338_with_dsym_and_run_command(self): > - """Test that NSArray reports its synthetic children properly.""" > - self.buildDsym() > - self.rdar11086338_tester() > - > - @skipUnlessDarwin > - @dwarf_test > - def test_rdar11086338_with_dwarf_and_run_command(self): > - """Test that NSArray reports its synthetic children properly.""" > - self.buildDwarf() > - self.rdar11086338_tester() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.m', '// Set break point at this > line.') > - > - def rdar11086338_tester(self): > - """Test that NSArray reports its synthetic children properly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.m", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format clear', check=False) > - self.runCmd('type summary clear', check=False) > - self.runCmd('type synth clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - # Now check that we are displaying Cocoa classes correctly > - self.expect('frame variable arr', > - substrs = ['@"6 objects"']) > - self.expect('frame variable other_arr', > - substrs = ['@"4 objects"']) > - self.expect('frame variable arr --ptr-depth 1', > - substrs = ['@"6 objects"','[0] = 0x','[1] = 0x','[2] > = 0x','[3] = 0x','[4] = 0x','[5] = 0x']) > - self.expect('frame variable other_arr --ptr-depth 1', > - substrs = ['@"4 objects"','[0] = 0x','[1] = 0x','[2] > = 0x','[3] = 0x']) > - self.expect('frame variable arr --ptr-depth 1 -d no-run-target', > - substrs = ['@"6 > objects"','@"hello"','@"world"','@"this"','@"is"','@"me"','@" > http://www.apple.com']) > - self.expect('frame variable other_arr --ptr-depth 1 -d > no-run-target', > - substrs = ['@"4 objects"','(int)5','@"a string"','@"6 > objects"']) > - self.expect('frame variable other_arr --ptr-depth 2 -d > no-run-target', > - substrs = ['@"4 objects"','@"6 objects" > {','@"hello"','@"world"','@"this"','@"is"','@"me"','@"http://www.apple.com > ']) > - > - > self.assertTrue(self.frame().FindVariable("arr").MightHaveChildren(), "arr > says it does not have children!") > - > self.assertTrue(self.frame().FindVariable("other_arr").MightHaveChildren(), > "arr says it does not have children!") > - > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar > 11988289.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py?p2=lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar%2011988289.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar > 11988289.py (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py > Tue Aug 25 18:55:10 2015 > @@ -9,7 +9,7 @@ from lldbtest import * > import datetime > import lldbutil > > -class DataFormatterRdar11988289TestCase(TestBase): > +class NSDictionarySyntheticTestCase(TestBase): > > mydir = TestBase.compute_mydir(__file__) > > > Removed: > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestRdar > 11988289.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar%2011988289.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestRdar > 11988289.py (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nsdictionarysynth/TestRdar > 11988289.py (removed) > @@ -1,85 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import datetime > -import lldbutil > - > -class DataFormatterRdar11988289TestCase(TestBase): > - > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_rdar11988289_with_dsym_and_run_command(self): > - """Test that NSDictionary reports its synthetic children > properly.""" > - self.buildDsym() > - self.rdar11988289_tester() > - > - @skipUnlessDarwin > - @dwarf_test > - def test_rdar11988289_with_dwarf_and_run_command(self): > - """Test that NSDictionary reports its synthetic children > properly.""" > - self.buildDwarf() > - self.rdar11988289_tester() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.m', '// Set break point at this > line.') > - > - def rdar11988289_tester(self): > - """Test that NSDictionary reports its synthetic children > properly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.m", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format clear', check=False) > - self.runCmd('type summary clear', check=False) > - self.runCmd('type synth clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - # Now check that we are displaying Cocoa classes correctly > - self.expect('frame variable dictionary', > - substrs = ['3 key/value pairs']) > - 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] = ']) > - self.expect('frame variable mutabledict --ptr-depth 1', > - 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"']) > - 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"']) > - > - > 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!") > - > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py?p2=lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py > Tue Aug 25 18:55:10 2015 > @@ -9,7 +9,7 @@ from lldbtest import * > import datetime > import lldbutil > > -class DataFormatterRdar12529957TestCase(TestBase): > +class NSSetSyntheticTestCase(TestBase): > > mydir = TestBase.compute_mydir(__file__) > > > Removed: > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestRdar12529957.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestRdar12529957.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/nssetsynth/TestRdar12529957.py > (removed) > @@ -1,89 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import datetime > -import lldbutil > - > -class DataFormatterRdar12529957TestCase(TestBase): > - > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_rdar12529957_with_dsym_and_run_command(self): > - """Test that NSSet reports its synthetic children properly.""" > - self.buildDsym() > - self.rdar12529957_tester() > - > - @skipUnlessDarwin > - @dwarf_test > - def test_rdar12529957_with_dwarf_and_run_command(self): > - """Test that NSSet reports its synthetic children properly.""" > - self.buildDwarf() > - self.rdar12529957_tester() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.m', '// Set break point at this > line.') > - > - def rdar12529957_tester(self): > - """Test that NSSet reports its synthetic children properly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.m", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format clear', check=False) > - self.runCmd('type summary clear', check=False) > - self.runCmd('type synth clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - # Now check that we are displaying Cocoa classes correctly > - self.expect('frame variable set', > - substrs = ['4 objects']) > - self.expect('frame variable mutable', > - substrs = ['9 objects']) > - self.expect('frame variable set --ptr-depth 1 -d run -T', > - substrs = ['4 > objects','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2']) > - self.expect('frame variable mutable --ptr-depth 1 -d run -T', > - substrs = ['9 objects','(int)5','@"3 objects"','@" > www.apple.com"','(int)3','@"world"','(int)4']) > - > - self.runCmd("next") > - self.expect('frame variable mutable', > - substrs = ['0 objects']) > - > - self.runCmd("next") > - self.expect('frame variable mutable', > - substrs = ['4 objects']) > - self.expect('frame variable mutable --ptr-depth 1 -d run -T', > - substrs = ['4 > objects','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2']) > - > - self.runCmd("next") > - self.expect('frame variable mutable', > - substrs = ['4 objects']) > - self.expect('frame variable mutable --ptr-depth 1 -d run -T', > - substrs = ['4 > objects','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2']) > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Removed: > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestRdar10887661.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestRdar10887661.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestRdar10887661.py > (removed) > @@ -1,92 +0,0 @@ > -""" > -Check for an issue where capping does not work because the Target pointer > appears to be changing behind our backs > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import lldbutil > - > -class Rdar10887661TestCase(TestBase): > - > - mydir = TestBase.compute_mydir(__file__) > - > - # rdar://problem/10887661 > - @skipUnlessDarwin > - @dsym_test > - def test_with_dsym_and_run_command(self): > - """Check for an issue where capping does not work because the > Target pointer appears to be changing behind our backs.""" > - self.buildDsym() > - self.capping_test_commands() > - > - # rdar://problem/10887661 > - @dwarf_test > - def test_with_dwarf_and_run_command(self): > - """Check for an issue where capping does not work because the > Target pointer appears to be changing behind our backs.""" > - self.buildDwarf() > - self.capping_test_commands() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.cpp', '// Set break point at this > line.') > - > - def capping_test_commands(self): > - """Check for an issue where capping does not work because the > Target pointer appears to be changing behind our backs.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format clear', check=False) > - self.runCmd('type summary clear', check=False) > - self.runCmd('type filter clear', check=False) > - self.runCmd('type synth clear', check=False) > - self.runCmd("settings set target.max-children-count 256", > check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - # set up the synthetic children provider > - self.runCmd("script from fooSynthProvider import *") > - self.runCmd("type synth add -l fooSynthProvider foo") > - > - # check that the synthetic children work, so we know we are doing > the right thing > - self.expect("frame variable f00_1", > - substrs = ['r = 33', > - 'fake_a = 16777216', > - 'a = 0']); > - > - # check that capping works > - self.runCmd("settings set target.max-children-count 2", > check=False) > - > - self.expect("frame variable f00_1", > - substrs = ['...', > - 'fake_a = 16777216', > - 'a = 0']); > - > - self.expect("frame variable f00_1", matching=False, > - substrs = ['r = 33']); > - > - > - self.runCmd("settings set target.max-children-count 256", > check=False) > - > - self.expect("frame variable f00_1", matching=True, > - substrs = ['r = 33']); > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py?p2=lldb/trunk/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py > Tue Aug 25 18:55:10 2015 > @@ -8,11 +8,10 @@ import lldb > from lldbtest import * > import lldbutil > > -class Rdar10887661TestCase(TestBase): > +class SyntheticCappingTestCase(TestBase): > > mydir = TestBase.compute_mydir(__file__) > > - # rdar://problem/10887661 > @skipUnlessDarwin > @dsym_test > def test_with_dsym_and_run_command(self): > @@ -20,7 +19,6 @@ class Rdar10887661TestCase(TestBase): > self.buildDsym() > self.capping_test_commands() > > - # rdar://problem/10887661 > @dwarf_test > def test_with_dwarf_and_run_command(self): > """Check for an issue where capping does not work because the > Target pointer appears to be changing behind our backs.""" > > Removed: > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestRdar12437442.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestRdar12437442.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestRdar12437442.py > (removed) > @@ -1,90 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import datetime > -import lldbutil > - > -class DataFormatterRdar12437442TestCase(TestBase): > - > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_rdar12437442_with_dsym_and_run_command(self): > - """Test that we update SBValues correctly as dynamic types > change.""" > - self.buildDsym() > - self.rdar12437442_tester() > - > - @skipUnlessDarwin > - @dwarf_test > - def test_rdar12437442_with_dwarf_and_run_command(self): > - """Test that we update SBValues correctly as dynamic types > change.""" > - self.buildDwarf() > - self.rdar12437442_tester() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.m', '// Set break point at this > line.') > - > - def rdar12437442_tester(self): > - """Test that we update SBValues correctly as dynamic types > change.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.m", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type format clear', check=False) > - self.runCmd('type summary clear', check=False) > - self.runCmd('type synth clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - # Now run the bulk of the test > - id_x = > self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame().FindVariable("x") > - id_x.SetPreferDynamicValue(lldb.eDynamicCanRunTarget) > - id_x.SetPreferSyntheticValue(True) > - > - if self.TraceOn(): > - self.runCmd("expr --dynamic-type run-target --ptr-depth 1 -- > x") > - > - self.assertTrue(id_x.GetSummary() == '@"5 objects"', "array does > not get correct summary") > - > - self.runCmd("next") > - self.runCmd("frame select 0") > - > - id_x = > self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame().FindVariable("x") > - id_x.SetPreferDynamicValue(lldb.eDynamicCanRunTarget) > - id_x.SetPreferSyntheticValue(True) > - > - if self.TraceOn(): > - self.runCmd("expr --dynamic-type run-target --ptr-depth 1 -- > x") > - > - self.assertTrue(id_x.GetNumChildren() == 7, "dictionary does not > have 7 children") > - id_x.SetPreferSyntheticValue(False) > - self.assertFalse(id_x.GetNumChildren() == 7, "dictionary still > looks synthetic") > - id_x.SetPreferSyntheticValue(True) > - self.assertTrue(id_x.GetSummary() == "7 key/value pairs", > "dictionary does not get correct summary") > - > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py?p2=lldb/trunk/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py > Tue Aug 25 18:55:10 2015 > @@ -9,7 +9,7 @@ from lldbtest import * > import datetime > import lldbutil > > -class DataFormatterRdar12437442TestCase(TestBase): > +class SyntheticFilterRecomputingTestCase(TestBase): > > mydir = TestBase.compute_mydir(__file__) > > > Removed: > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/Test-rdar-9973865.py > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py?rev=245991&view=auto > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/Test-rdar-9973865.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/Test-rdar-9973865.py > (removed) > @@ -1,77 +0,0 @@ > -""" > -Test lldb data formatter subsystem. > -""" > - > -import os, time > -import unittest2 > -import lldb > -from lldbtest import * > -import lldbutil > - > -class Radar9973865DataFormatterTestCase(TestBase): > - > - # test for rdar://problem/9973865 (If you use "${var}" in the summary > string for an aggregate type, the summary doesn't print for a pointer to > that type) > - mydir = TestBase.compute_mydir(__file__) > - > - @skipUnlessDarwin > - @dsym_test > - def test_with_dsym_and_run_command(self): > - """Test data formatter commands.""" > - self.buildDsym() > - self.data_formatter_commands() > - > - @dwarf_test > - def test_with_dwarf_and_run_command(self): > - """Test data formatter commands.""" > - > - self.buildDwarf() > - self.data_formatter_commands() > - > - def setUp(self): > - # Call super's setUp(). > - TestBase.setUp(self) > - # Find the line number to break at. > - self.line = line_number('main.cpp', '// Set break point at this > line.') > - > - def data_formatter_commands(self): > - """Test that that file and class static variables display > correctly.""" > - self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) > - > - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", > self.line, num_expected_locations=1, loc_exact=True) > - > - self.runCmd("run", RUN_SUCCEEDED) > - > - # The stop reason of the thread should be breakpoint. > - self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, > - substrs = ['stopped', > - 'stop reason = breakpoint']) > - > - # This is the function to remove the custom formats in order to > have a > - # clean slate for the next test case. > - def cleanup(): > - self.runCmd('type summary clear', check=False) > - > - # Execute the cleanup function during test case tear down. > - self.addTearDownHook(cleanup) > - > - self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS > ${var}\" Summarize") > - > - self.expect('frame variable mine_ptr', > - substrs = ['SUMMARY SUCCESS summarize_ptr_t @ ']) > - > - self.expect('frame variable *mine_ptr', > - substrs = ['SUMMARY SUCCESS summarize_t @']) > - > - self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS > ${var.first}\" Summarize") > - > - self.expect('frame variable mine_ptr', > - substrs = ['SUMMARY SUCCESS 10']) > - > - self.expect('frame variable *mine_ptr', > - substrs = ['SUMMARY SUCCESS 10']) > - > -if __name__ == '__main__': > - import atexit > - lldb.SBDebugger.Initialize() > - atexit.register(lambda: lldb.SBDebugger.Terminate()) > - unittest2.main() > > Copied: > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py > (from r245991, > lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py) > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py?p2=lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py&p1=lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py&r1=245991&r2=245993&rev=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py > Tue Aug 25 18:55:10 2015 > @@ -8,9 +8,8 @@ import lldb > from lldbtest import * > import lldbutil > > -class Radar9973865DataFormatterTestCase(TestBase): > +class VarInAggregateMisuseTestCase(TestBase): > > - # test for rdar://problem/9973865 (If you use "${var}" in the summary > string for an aggregate type, the summary doesn't print for a pointer to > that type) > mydir = TestBase.compute_mydir(__file__) > > @skipUnlessDarwin > @@ -70,6 +69,20 @@ class Radar9973865DataFormatterTestCase( > self.expect('frame variable *mine_ptr', > substrs = ['SUMMARY SUCCESS 10']) > > + self.runCmd("type summary add --summary-string \"${var}\" > Summarize") > + self.runCmd("type summary add --summary-string \"${var}\" -e > TwoSummarizes") > + > + self.expect('frame variable', > + substrs = ['(TwoSummarizes) twos = TwoSummarizes @ ', > + 'first = summarize_t @ ', > + 'second = summarize_t @ ']) > + > + self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS > ${var.first}\" Summarize") > + self.expect('frame variable', > + substrs = ['(TwoSummarizes) twos = TwoSummarizes @ ', > + 'first = SUMMARY SUCCESS 1', > + 'second = SUMMARY SUCCESS 3']) > + > if __name__ == '__main__': > import atexit > lldb.SBDebugger.Initialize() > > Modified: > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp > URL: > http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp?rev=245993&r1=245991&r2=245993&view=diff > > ============================================================================== > --- > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp > (original) > +++ > lldb/trunk/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp > Tue Aug 25 18:55:10 2015 > @@ -14,17 +14,28 @@ struct Summarize > int second; > }; > > -typedef Summarize summarize_t; > +typedef struct Summarize summarize_t; > typedef summarize_t *summarize_ptr_t; > > summarize_t global_mine = {30, 40}; > > +struct TwoSummarizes > +{ > + summarize_t first; > + summarize_t second; > +}; > + > int > main() > { > summarize_t mine = {10, 20}; > summarize_ptr_t mine_ptr = &mine; > + > + TwoSummarizes twos = { {1,2}, {3,4} }; > + > printf ("Summarize: first: %d second: %d and address: 0x%p\n", > mine.first, mine.second, mine_ptr); // Set break point at this line. > printf ("Global summarize: first: %d second: %d.\n", > global_mine.first, global_mine.second); > return 0; > } > + > + > > > _______________________________________________ > lldb-commits mailing list > lldb-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits >
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
