diff options
21 files changed, 33 insertions, 29 deletions
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 35d8cfd14f9..4dff1420c4e 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -641,7 +641,7 @@ CommandObjectMultiwordBreakpoint::VerifyBreakpointIDs (Args &args, Target *targe CommandObjectBreakpointList::CommandOptions::CommandOptions() : Options (), - m_level (lldb::eDescriptionLevelFull) // Breakpoint List defaults to brief descriptions + m_level (lldb::eDescriptionLevelBrief) // Breakpoint List defaults to brief descriptions { } @@ -708,7 +708,7 @@ CommandObjectBreakpointList::CommandOptions::ResetOptionValues () { Options::ResetOptionValues(); - m_level = lldb::eDescriptionLevelFull; + m_level = lldb::eDescriptionLevelBrief; m_internal = false; } diff --git a/lldb/test/alias_tests/TestAliases.py b/lldb/test/alias_tests/TestAliases.py index bbf1f8eecf0..9cb26c44a9a 100644 --- a/lldb/test/alias_tests/TestAliases.py +++ b/lldb/test/alias_tests/TestAliases.py @@ -74,7 +74,7 @@ class AliasTestCase(TestBase): self.runCmd ("bpa -p 1 -o 'print frame; print bp_loc'") self.runCmd ("bpa -c 2 -o 'frame variable b'") - self.expect ("bpi", + self.expect ("bpi -f", substrs = [ "Current breakpoints:", "1: name = 'foo', locations = 1", "print frame; print bp_loc", diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/array_types/TestArrayTypes.py index 5907480cca8..905319ebae0 100644 --- a/lldb/test/array_types/TestArrayTypes.py +++ b/lldb/test/array_types/TestArrayTypes.py @@ -64,7 +64,7 @@ class ArrayTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = ['resolved, hit count = 1']) # Issue 'variable list' command on several array-type variables. diff --git a/lldb/test/bitfields/TestBitfields.py b/lldb/test/bitfields/TestBitfields.py index 9396b89f6a7..d5c95f2c14b 100644 --- a/lldb/test/bitfields/TestBitfields.py +++ b/lldb/test/bitfields/TestBitfields.py @@ -58,7 +58,7 @@ class BitfieldsTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # This should display correctly. diff --git a/lldb/test/breakpoint_command/TestBreakpointCommand.py b/lldb/test/breakpoint_command/TestBreakpointCommand.py index d4aba4137e5..73e46b78adc 100644 --- a/lldb/test/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/breakpoint_command/TestBreakpointCommand.py @@ -59,6 +59,10 @@ class BreakpointCommandTestCase(TestBase): # The breakpoint list now only contains breakpoint 1. self.expect("breakpoint list", "Breakpoints 1 & 2 created", substrs = ["1: file ='main.c', line = %d, locations = 1" % self.line, + "2: file ='main.c', line = %d, locations = 1" % self.line] ) + + self.expect("breakpoint list -f", "Breakpoints 1 & 2 created", + substrs = ["1: file ='main.c', line = %d, locations = 1" % self.line, "2: file ='main.c', line = %d, locations = 1" % self.line], patterns = ["1.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line, "2.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line]) @@ -105,13 +109,13 @@ class BreakpointCommandTestCase(TestBase): startstr = "error: '2' is not a currently valid breakpoint id.") # The breakpoint list now only contains breakpoint 1. - self.expect("breakpoint list", "Breakpoint 1 exists", + self.expect("breakpoint list -f", "Breakpoint 1 exists", substrs = ["1: file ='main.c', line = %d, locations = 1, resolved = 1" % self.line, "hit count = 1"]) # Not breakpoint 2. - self.expect("breakpoint list", "No more breakpoint 2", matching=False, + self.expect("breakpoint list -f", "No more breakpoint 2", matching=False, substrs = ["2: file ='main.c', line = %d, locations = 1, resolved = 1" % self.line]) @@ -126,7 +130,7 @@ class BreakpointCommandTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 2. - self.expect("breakpoint list", BREAKPOINT_HIT_TWICE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_TWICE, substrs = ['resolved, hit count = 2']) def breakpoint_command_script_parameters (self): diff --git a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/breakpoint_conditions/TestBreakpointConditions.py index b168c8104e2..c022e16a64e 100644 --- a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py +++ b/lldb/test/breakpoint_conditions/TestBreakpointConditions.py @@ -67,7 +67,7 @@ class BreakpointConditionsTestCase(TestBase): startstr = '(int) val = 3') # Also check the hit count, which should be 3, by design. - self.expect("breakpoint list", BREAKPOINT_HIT_THRICE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE, substrs = ["resolved = 1", "Condition: val == 3", "hit count = 3"]) @@ -83,7 +83,7 @@ class BreakpointConditionsTestCase(TestBase): # created breakpoint, so that when the breakpoint hits, val == 1. self.runCmd("process kill") self.runCmd("breakpoint modify -c ''") - self.expect("breakpoint list", BREAKPOINT_STATE_CORRECT, matching=False, + self.expect("breakpoint list -f", BREAKPOINT_STATE_CORRECT, matching=False, substrs = ["Condition:"]) # Now run the program again. diff --git a/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py index c3b9405cdce..4909a47fe01 100644 --- a/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py +++ b/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py @@ -63,7 +63,7 @@ class BreakpointIgnoreCountTestCase(TestBase): patterns = ['Process .* stopped']) # Also check the hit count, which should be 2, due to ignore count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_THRICE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE, substrs = ["resolved = 1", "hit count = 2"]) diff --git a/lldb/test/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/breakpoint_locations/TestBreakpointLocations.py index 81d53778c40..335af66162c 100644 --- a/lldb/test/breakpoint_locations/TestBreakpointLocations.py +++ b/lldb/test/breakpoint_locations/TestBreakpointLocations.py @@ -40,7 +40,7 @@ class BreakpointLocationsTestCase(TestBase): self.line) # The breakpoint list should show 3 locations. - self.expect("breakpoint list", "Breakpoint locations shown correctly", + self.expect("breakpoint list -f", "Breakpoint locations shown correctly", substrs = ["1: file ='main.c', line = %d, locations = 3" % self.line], patterns = ["where = a.out`func_inlined .+unresolved, hit count = 0", "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"]) @@ -85,7 +85,7 @@ class BreakpointLocationsTestCase(TestBase): substrs = ["stop reason = breakpoint 1."]) # At this point, 1.1 has a hit count of 0 and the other a hit count of 1". - self.expect("breakpoint list", "The breakpoints should report correct hit counts", + self.expect("breakpoint list -f", "The breakpoints should report correct hit counts", patterns = ["1\.1: .+ unresolved, hit count = 0 +Options: disabled", "1\.2: .+ resolved, hit count = 1", "1\.3: .+ resolved, hit count = 1"]) diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/class_types/TestClassTypes.py index c52f7320c71..6ff53726243 100644 --- a/lldb/test/class_types/TestClassTypes.py +++ b/lldb/test/class_types/TestClassTypes.py @@ -84,7 +84,7 @@ class ClassTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # We should be stopped on the ctor function of class C. @@ -172,7 +172,7 @@ class ClassTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Continue on inside the ctor() body... diff --git a/lldb/test/dead-strip/TestDeadStrip.py b/lldb/test/dead-strip/TestDeadStrip.py index f1ed17625de..1372c7165d5 100644 --- a/lldb/test/dead-strip/TestDeadStrip.py +++ b/lldb/test/dead-strip/TestDeadStrip.py @@ -48,7 +48,7 @@ class DeadStripTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list 1", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f 1", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) self.runCmd("continue") @@ -60,7 +60,7 @@ class DeadStripTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list 3", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f 3", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) diff --git a/lldb/test/enum_types/TestEnumTypes.py b/lldb/test/enum_types/TestEnumTypes.py index a02c0618c65..f5baeac75c9 100644 --- a/lldb/test/enum_types/TestEnumTypes.py +++ b/lldb/test/enum_types/TestEnumTypes.py @@ -47,7 +47,7 @@ class EnumTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Look up information about the 'days' enum type. diff --git a/lldb/test/forward/TestForwardDeclaration.py b/lldb/test/forward/TestForwardDeclaration.py index 794acdfd88e..639c9bc8fbe 100644 --- a/lldb/test/forward/TestForwardDeclaration.py +++ b/lldb/test/forward/TestForwardDeclaration.py @@ -41,7 +41,7 @@ class ForwardDeclarationTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # This should display correctly. diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/function_types/TestFunctionTypes.py index 66997170ee3..b0fbd5b3f94 100644 --- a/lldb/test/function_types/TestFunctionTypes.py +++ b/lldb/test/function_types/TestFunctionTypes.py @@ -45,7 +45,7 @@ class FunctionTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Check that the 'callback' variable display properly. diff --git a/lldb/test/global_variables/TestGlobalVariables.py b/lldb/test/global_variables/TestGlobalVariables.py index 581d123d205..b927bcb932b 100644 --- a/lldb/test/global_variables/TestGlobalVariables.py +++ b/lldb/test/global_variables/TestGlobalVariables.py @@ -45,7 +45,7 @@ class GlobalVariablesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Check that GLOBAL scopes are indicated for the variables. diff --git a/lldb/test/load_unload/TestLoadUnload.py b/lldb/test/load_unload/TestLoadUnload.py index def3aef376f..8dff34df47b 100644 --- a/lldb/test/load_unload/TestLoadUnload.py +++ b/lldb/test/load_unload/TestLoadUnload.py @@ -184,7 +184,7 @@ class LoadUnloadTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Issue the 'contnue' command. We should stop agaian at a_function. @@ -199,7 +199,7 @@ class LoadUnloadTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 2. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 2']) diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/set_values/TestSetValues.py index 50f8052a85d..aab09a9f617 100644 --- a/lldb/test/set_values/TestSetValues.py +++ b/lldb/test/set_values/TestSetValues.py @@ -69,7 +69,7 @@ class SetValuesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # main.c:15 diff --git a/lldb/test/signal/TestSendSignal.py b/lldb/test/signal/TestSendSignal.py index 180ae804588..8748de0b2ab 100644 --- a/lldb/test/signal/TestSendSignal.py +++ b/lldb/test/signal/TestSendSignal.py @@ -47,7 +47,7 @@ class SendSignalTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) self.runCmd("process status") diff --git a/lldb/test/signed_types/TestSignedTypes.py b/lldb/test/signed_types/TestSignedTypes.py index f3389aaf41f..9d045c87235 100644 --- a/lldb/test/signed_types/TestSignedTypes.py +++ b/lldb/test/signed_types/TestSignedTypes.py @@ -47,7 +47,7 @@ class UnsignedTypesTestCase(TestBase): substrs = ['state is stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Execute the assignment statement. diff --git a/lldb/test/stl/TestSTL.py b/lldb/test/stl/TestSTL.py index b489bae2f34..efa7fb4be82 100644 --- a/lldb/test/stl/TestSTL.py +++ b/lldb/test/stl/TestSTL.py @@ -56,7 +56,7 @@ class STLTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Now do 'thread step-in', we should stop on the basic_string template. diff --git a/lldb/test/struct_types/TestStructTypes.py b/lldb/test/struct_types/TestStructTypes.py index d5d922a7c5a..82b0322ed0b 100644 --- a/lldb/test/struct_types/TestStructTypes.py +++ b/lldb/test/struct_types/TestStructTypes.py @@ -52,7 +52,7 @@ class StructTypesTestCase(TestBase): 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/unsigned_types/TestUnsignedTypes.py index a18bc60e175..185fac31d6a 100644 --- a/lldb/test/unsigned_types/TestUnsignedTypes.py +++ b/lldb/test/unsigned_types/TestUnsignedTypes.py @@ -47,7 +47,7 @@ class UnsignedTypesTestCase(TestBase): substrs = ['state is stopped', 'stop reason = breakpoint']) # The breakpoint should have a hit count of 1. - self.expect("breakpoint list", BREAKPOINT_HIT_ONCE, + self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) # Test that unsigned types display correctly. |
