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