[Lldb-commits] [lldb] r162419 - in /lldb/trunk: source/Interpreter/CommandInterpreter.cpp test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py

[Johnny Chen]

Author: johnny
Date: Wed Aug 22 19:32:22 2012
New Revision: 162419

URL: http://llvm.org/viewvc/llvm-project?rev=162419&view=rev
Log:
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.

Added:
    lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=162419&r1=162418&r2=162419&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Wed Aug 22 19:32:22 2012
@@ -362,11 +362,12 @@
     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") &&

Added: lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py?rev=162419&view=auto
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py (added)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py Wed Aug 22 19:32:22 2012
@@ -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()