Author: jingham
Date: Fri Nov 18 16:06:10 2016
New Revision: 287386
URL: http://llvm.org/viewvc/llvm-project?rev=287386&view=rev
Log:
Fix "thread step until" handling of multiple line inputs.
Also document that it handles same, and add some tests.
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c
Modified:
lldb/trunk/source/Commands/CommandObjectThread.cpp
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile?rev=287386&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile
Fri Nov 18 16:06:10 2016
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py?rev=287386&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/TestStepUntil.py
Fri Nov 18 16:06:10 2016
@@ -0,0 +1,92 @@
+"""Test stepping over vrs. hitting breakpoints & subsequent stepping in
various forms."""
+
+from __future__ import print_function
+
+
+import os
+import time
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TestCStepping(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def getCategories(self):
+ return ['basic_process']
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+ # Find the line numbers that we will step to in main:
+ self.main_source = "main.c"
+ self.less_than_two = line_number('main.c', 'Less than 2')
+ self.greater_than_two = line_number('main.c', 'Greater than or equal
to 2.')
+ self.back_out_in_main = line_number('main.c', 'Back out in main')
+
+ def do_until (self, args, until_lines, expected_linenum):
+ self.build()
+ exe = os.path.join(os.getcwd(), "a.out")
+
+ target = self.dbg.CreateTarget(exe)
+ self.assertTrue(target, VALID_TARGET)
+
+ main_source_spec = lldb.SBFileSpec(self.main_source)
+ break_before = target.BreakpointCreateBySourceRegex(
+ 'At the start',
+ main_source_spec)
+ self.assertTrue(break_before, VALID_BREAKPOINT)
+
+ # Now launch the process, and do not stop at entry point.
+ process = target.LaunchSimple(
+ args, None, self.get_process_working_directory())
+
+ self.assertTrue(process, PROCESS_IS_VALID)
+
+ # The stop reason of the thread should be breakpoint.
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ process, break_before)
+
+ if len(threads) != 1:
+ self.fail("Failed to stop at first breakpoint in main.")
+
+ thread = threads[0]
+ return thread
+
+ thread = self.common_setup(None)
+
+ cmd_interp = self.dbg.GetCommandInterpreter()
+ ret_obj = lldb.SBCommandReturnObject()
+
+ cmd_line = "thread until"
+ for line_num in until_lines:
+ cmd_line += " %d"%(line_num)
+
+ cmd_interp.HandleCommand(cmd_line, ret_obj)
+ self.assertTrue(ret_obj.Succeeded(), "'%s' failed: %s."%(cmd_line,
ret_obj.GetError()))
+
+ frame = thread.frames[0]
+ line = frame.GetLineEntry().GetLine()
+ self.assertEqual(line, expected_linenum, 'Did not get the expected
stop line number')
+
+ def test_hitting_one (self):
+ """Test thread step until - targeting one line and hitting it."""
+ self.do_until(None, [self.less_than_two], self.less_than_two)
+
+ def test_targetting_two_hitting_first (self):
+ """Test thread step until - targeting two lines and hitting one."""
+ self.do_until(["foo", "bar", "baz"], [self.less_than_two,
self.greater_than_two], self.greater_than_two)
+
+ def test_targetting_two_hitting_second (self):
+ """Test thread step until - targeting two lines and hitting the other
one."""
+ self.do_until(None, [self.less_than_two, self.greater_than_two],
self.less_than_two)
+
+ def test_missing_one (self):
+ """Test thread step until - targeting one line and missing it."""
+ self.do_until(["foo", "bar", "baz"], [self.less_than_two],
self.back_out_in_main)
+
+
+
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c?rev=287386&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/main.c
Fri Nov 18 16:06:10 2016
@@ -0,0 +1,20 @@
+#include <stdio.h>
+
+void call_me(int argc)
+{
+ printf ("At the start, argc: %d.\n", argc);
+
+ if (argc < 2)
+ printf("Less than 2.\n");
+ else
+ printf("Greater than or equal to 2.\n");
+}
+
+int
+main(int argc, char **argv)
+{
+ call_me(argc);
+ printf("Back out in main.\n");
+
+ return 0;
+}
Modified: lldb/trunk/source/Commands/CommandObjectThread.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectThread.cpp?rev=287386&r1=287385&r2=287386&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectThread.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectThread.cpp Fri Nov 18 16:06:10 2016
@@ -977,7 +977,9 @@ public:
interpreter, "thread until",
"Continue until a line number or address is reached by the "
"current or specified thread. Stops when returning from "
- "the current function as a safety measure.",
+ "the current function as a safety measure. "
+ "The target line number(s) are given as arguments, and if more
than one"
+ " is provided, stepping will stop when the first one is hit.",
nullptr,
eCommandRequiresThread | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched | eCommandProcessMustBePaused),
@@ -1025,11 +1027,11 @@ protected:
size_t num_args = command.GetArgumentCount();
for (size_t i = 0; i < num_args; i++) {
uint32_t line_number;
- line_number = StringConvert::ToUInt32(command.GetArgumentAtIndex(0),
+ line_number = StringConvert::ToUInt32(command.GetArgumentAtIndex(i),
UINT32_MAX);
if (line_number == UINT32_MAX) {
result.AppendErrorWithFormat("invalid line number: '%s'.\n",
- command.GetArgumentAtIndex(0));
+ command.GetArgumentAtIndex(i));
result.SetStatus(eReturnStatusFailed);
return false;
} else
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
