vsk updated this revision to Diff 304355.
vsk added a comment.
Simplify, using run_to_source_breakpoint.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D91220/new/
https://reviews.llvm.org/D91220
Files:
lldb/packages/Python/lldbsuite/test/lldbtest.py
lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
lldb/test/API/lang/c/stepping/main.c
Index: lldb/test/API/lang/c/stepping/main.c
===================================================================
--- lldb/test/API/lang/c/stepping/main.c
+++ lldb/test/API/lang/c/stepping/main.c
@@ -39,7 +39,7 @@
{
int A1 = a(1); // frame select 2, thread step-out while stopped at "c(1)"
- int B2 = b(2);
+ int B2 = b(2); // assignment to B2
int A3 = a(3); // frame select 1, thread step-out while stopped at "c(3)"
Index: lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
===================================================================
--- /dev/null
+++ lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
@@ -0,0 +1,33 @@
+"""
+Test thread step-in [ -r | --step-over-regexp ].
+"""
+
+
+
+import lldb
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
+
+
+class ThreadStepInAvoidRegexTestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ TestBase.setUp(self)
+ self.line2 = line_number('main.c', '// assignment to B2')
+
+ def test_step_out_avoid_regexp(self):
+ """Exercise thread step-in -r"""
+ self.build()
+ lldbutil.run_to_source_breakpoint(self,
+ 'frame select 2, thread step-out while stopped',
+ lldb.SBFileSpec('main.c'))
+
+ # Now step in, skipping the frames for 'b' and 'a'.
+ self.runCmd("thread step-in -r 'a'")
+
+ # We should be at the assignment to B2.
+ self.expect("thread backtrace", STEP_IN_SUCCEEDED,
+ substrs=["stop reason = step in"],
+ patterns=["frame #0.*main.c:%d" % self.line2])
Index: lldb/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -126,6 +126,8 @@
SOURCE_DISPLAYED_CORRECTLY = "Source code displayed correctly"
+STEP_IN_SUCCEEDED = "Thread step-in succeeded"
+
STEP_OUT_SUCCEEDED = "Thread step-out succeeded"
STOPPED_DUE_TO_EXC_BAD_ACCESS = "Process should be stopped due to bad access
exception"
Index: lldb/test/API/lang/c/stepping/main.c
===================================================================
--- lldb/test/API/lang/c/stepping/main.c
+++ lldb/test/API/lang/c/stepping/main.c
@@ -39,7 +39,7 @@
{
int A1 = a(1); // frame select 2, thread step-out while stopped at "c(1)"
- int B2 = b(2);
+ int B2 = b(2); // assignment to B2
int A3 = a(3); // frame select 1, thread step-out while stopped at "c(3)"
Index: lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
===================================================================
--- /dev/null
+++ lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
@@ -0,0 +1,33 @@
+"""
+Test thread step-in [ -r | --step-over-regexp ].
+"""
+
+
+
+import lldb
+from lldbsuite.test.lldbtest import *
+import lldbsuite.test.lldbutil as lldbutil
+
+
+class ThreadStepInAvoidRegexTestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ TestBase.setUp(self)
+ self.line2 = line_number('main.c', '// assignment to B2')
+
+ def test_step_out_avoid_regexp(self):
+ """Exercise thread step-in -r"""
+ self.build()
+ lldbutil.run_to_source_breakpoint(self,
+ 'frame select 2, thread step-out while stopped',
+ lldb.SBFileSpec('main.c'))
+
+ # Now step in, skipping the frames for 'b' and 'a'.
+ self.runCmd("thread step-in -r 'a'")
+
+ # We should be at the assignment to B2.
+ self.expect("thread backtrace", STEP_IN_SUCCEEDED,
+ substrs=["stop reason = step in"],
+ patterns=["frame #0.*main.c:%d" % self.line2])
Index: lldb/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -126,6 +126,8 @@
SOURCE_DISPLAYED_CORRECTLY = "Source code displayed correctly"
+STEP_IN_SUCCEEDED = "Thread step-in succeeded"
+
STEP_OUT_SUCCEEDED = "Thread step-out succeeded"
STOPPED_DUE_TO_EXC_BAD_ACCESS = "Process should be stopped due to bad access exception"
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
