Change "breakpoint list" command to default to brief output rather than full output.
Modify test cases in test suite to either expect brief output or to pass -f for full
output as appropriate.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@124905 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Commands/CommandObjectBreakpoint.cpp b/source/Commands/CommandObjectBreakpoint.cpp
index 35d8cfd..4dff142 100644
--- a/source/Commands/CommandObjectBreakpoint.cpp
+++ b/source/Commands/CommandObjectBreakpoint.cpp
@@ -641,7 +641,7 @@
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 @@
{
Options::ResetOptionValues();
- m_level = lldb::eDescriptionLevelFull;
+ m_level = lldb::eDescriptionLevelBrief;
m_internal = false;
}
diff --git a/test/alias_tests/TestAliases.py b/test/alias_tests/TestAliases.py
index bbf1f8e..9cb26c4 100644
--- a/test/alias_tests/TestAliases.py
+++ b/test/alias_tests/TestAliases.py
@@ -74,7 +74,7 @@
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/test/array_types/TestArrayTypes.py b/test/array_types/TestArrayTypes.py
index 5907480..905319e 100644
--- a/test/array_types/TestArrayTypes.py
+++ b/test/array_types/TestArrayTypes.py
@@ -64,7 +64,7 @@
'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/test/bitfields/TestBitfields.py b/test/bitfields/TestBitfields.py
index 9396b89..d5c95f2 100644
--- a/test/bitfields/TestBitfields.py
+++ b/test/bitfields/TestBitfields.py
@@ -58,7 +58,7 @@
'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/test/breakpoint_command/TestBreakpointCommand.py b/test/breakpoint_command/TestBreakpointCommand.py
index d4aba41..73e46b7 100644
--- a/test/breakpoint_command/TestBreakpointCommand.py
+++ b/test/breakpoint_command/TestBreakpointCommand.py
@@ -59,6 +59,10 @@
# 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 @@
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 @@
'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/test/breakpoint_conditions/TestBreakpointConditions.py b/test/breakpoint_conditions/TestBreakpointConditions.py
index b168c81..c022e16 100644
--- a/test/breakpoint_conditions/TestBreakpointConditions.py
+++ b/test/breakpoint_conditions/TestBreakpointConditions.py
@@ -67,7 +67,7 @@
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 @@
# 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/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index c3b9405..4909a47 100644
--- a/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
@@ -63,7 +63,7 @@
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/test/breakpoint_locations/TestBreakpointLocations.py b/test/breakpoint_locations/TestBreakpointLocations.py
index 81d5377..335af66 100644
--- a/test/breakpoint_locations/TestBreakpointLocations.py
+++ b/test/breakpoint_locations/TestBreakpointLocations.py
@@ -40,7 +40,7 @@
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 @@
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/test/class_types/TestClassTypes.py b/test/class_types/TestClassTypes.py
index c52f732..6ff5372 100644
--- a/test/class_types/TestClassTypes.py
+++ b/test/class_types/TestClassTypes.py
@@ -84,7 +84,7 @@
'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 @@
'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/test/dead-strip/TestDeadStrip.py b/test/dead-strip/TestDeadStrip.py
index f1ed176..1372c71 100644
--- a/test/dead-strip/TestDeadStrip.py
+++ b/test/dead-strip/TestDeadStrip.py
@@ -48,7 +48,7 @@
'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 @@
'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/test/enum_types/TestEnumTypes.py b/test/enum_types/TestEnumTypes.py
index a02c061..f5baeac 100644
--- a/test/enum_types/TestEnumTypes.py
+++ b/test/enum_types/TestEnumTypes.py
@@ -47,7 +47,7 @@
'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/test/forward/TestForwardDeclaration.py b/test/forward/TestForwardDeclaration.py
index 794acdf..639c9bc 100644
--- a/test/forward/TestForwardDeclaration.py
+++ b/test/forward/TestForwardDeclaration.py
@@ -41,7 +41,7 @@
'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/test/function_types/TestFunctionTypes.py b/test/function_types/TestFunctionTypes.py
index 6699717..b0fbd5b 100644
--- a/test/function_types/TestFunctionTypes.py
+++ b/test/function_types/TestFunctionTypes.py
@@ -45,7 +45,7 @@
'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/test/global_variables/TestGlobalVariables.py b/test/global_variables/TestGlobalVariables.py
index 581d123..b927bcb 100644
--- a/test/global_variables/TestGlobalVariables.py
+++ b/test/global_variables/TestGlobalVariables.py
@@ -45,7 +45,7 @@
'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/test/load_unload/TestLoadUnload.py b/test/load_unload/TestLoadUnload.py
index def3aef..8dff34d 100644
--- a/test/load_unload/TestLoadUnload.py
+++ b/test/load_unload/TestLoadUnload.py
@@ -184,7 +184,7 @@
'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 @@
'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/test/set_values/TestSetValues.py b/test/set_values/TestSetValues.py
index 50f8052..aab09a9 100644
--- a/test/set_values/TestSetValues.py
+++ b/test/set_values/TestSetValues.py
@@ -69,7 +69,7 @@
'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/test/signal/TestSendSignal.py b/test/signal/TestSendSignal.py
index 180ae80..8748de0 100644
--- a/test/signal/TestSendSignal.py
+++ b/test/signal/TestSendSignal.py
@@ -47,7 +47,7 @@
'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/test/signed_types/TestSignedTypes.py b/test/signed_types/TestSignedTypes.py
index f3389aa..9d045c8 100644
--- a/test/signed_types/TestSignedTypes.py
+++ b/test/signed_types/TestSignedTypes.py
@@ -47,7 +47,7 @@
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/test/stl/TestSTL.py b/test/stl/TestSTL.py
index b489bae..efa7fb4 100644
--- a/test/stl/TestSTL.py
+++ b/test/stl/TestSTL.py
@@ -56,7 +56,7 @@
'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/test/struct_types/TestStructTypes.py b/test/struct_types/TestStructTypes.py
index d5d922a..82b0322 100644
--- a/test/struct_types/TestStructTypes.py
+++ b/test/struct_types/TestStructTypes.py
@@ -52,7 +52,7 @@
'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/test/unsigned_types/TestUnsignedTypes.py b/test/unsigned_types/TestUnsignedTypes.py
index a18bc60..185fac3 100644
--- a/test/unsigned_types/TestUnsignedTypes.py
+++ b/test/unsigned_types/TestUnsignedTypes.py
@@ -47,7 +47,7 @@
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.