maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

rdar://problem/12022371 

Make it so that "b 245" should set a breakpoint at line 245 of the current file.
Also add a simple test file.

llvm-svn: 162419
This commit is contained in:
Johnny Chen 2012-08-23 00:32:22 +00:00
parent 754a9369db
commit b417dcdbee
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -362,11 +362,12 @@ CommandInterpreter::LoadCommandDictionary ()
std::auto_ptr<CommandObjectRegexCommand>
break_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-break",
"Set a breakpoint using a regular expression to specify the location.",
"_regexp-break [<filename>:<linenum>]\n_regexp-break [<address>]\n_regexp-break <...>", 2));
"Set a breakpoint using a regular expression to specify the location, where <linenum> is in decimal and <address> is in hex.",
"_regexp-break [<filename>:<linenum>]\n_regexp-break [<linenum>]\n_regexp-break [<address>]\n_regexp-break <...>", 2));
if (break_regex_cmd_ap.get())
{
if (break_regex_cmd_ap->AddRegexCommand("^(.*[^[:space:]])[[:space:]]*:[[:space:]]*([[:digit:]]+)[[:space:]]*$", "breakpoint set --file '%1' --line %2") &&
break_regex_cmd_ap->AddRegexCommand("^([[:digit:]]+)[[:space:]]*$", "breakpoint set --line %1") &&
break_regex_cmd_ap->AddRegexCommand("^(0x[[:xdigit:]]+)[[:space:]]*$", "breakpoint set --address %1") &&
break_regex_cmd_ap->AddRegexCommand("^[\"']?([-+]\\[.*\\])[\"']?[[:space:]]*$", "breakpoint set --name '%1'") &&
break_regex_cmd_ap->AddRegexCommand("^$", "breakpoint list --full") &&

58
lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py Normal file
View File

@ -0,0 +1,58 @@
"""
Test _regexp-break command which uses regular expression matching to dispatch to other built in breakpoint commands.
"""
import os, time
import unittest2
import lldb
from lldbtest import *
class RegexpBreakCommandTestCase(TestBase):
mydir = os.path.join("functionalities", "breakpoint", "breakpoint_command")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
def test_with_dsym(self):
"""Test _regexp-break command."""
self.buildDsym()
self.regexp_break_command()
@dwarf_test
def test_with_dwarf(self):
"""Test _regexp-break command."""
self.buildDwarf()
self.regexp_break_command()
def setUp(self):
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to break inside main().
self.source = 'main.c'
self.line = line_number(self.source, '// Set break point at this line.')
def regexp_break_command(self):
"""Test the super consie "b" command, which is analias for _regexp-break."""
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.expect("b %d" % self.line,
BREAKPOINT_CREATED,
substrs = ["Breakpoint created: 1: file ='main.c', line = %d, locations = 1" % self.line])
self.expect("b %s:%d" % (self.source, self.line),
BREAKPOINT_CREATED,
substrs = ["Breakpoint created: 2: file ='main.c', line = %d, locations = 1" % self.line])
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'])
if __name__ == '__main__':
import atexit
lldb.SBDebugger.Initialize()
atexit.register(lambda: lldb.SBDebugger.Terminate())
unittest2.main()