tests: add ‘step over’ and ‘step out’ helpers

Author: igrr

testing/esp/debug_backend.py

@@ -114,6 +114,7 @@ class Gdb:
     TARGET_STOP_REASON_BP       = 3
     TARGET_STOP_REASON_WP       = 4
     TARGET_STOP_REASON_STEPPED  = 5
+    TARGET_STOP_REASON_FN_FINISHED = 6
 
     @staticmethod
     def get_logger():
@@ -139,6 +140,8 @@ def _on_notify(self, rec):
                     self._target_stop_reason = self.TARGET_STOP_REASON_WP
                 elif rec['payload']['reason'] == 'end-stepping-range':
                     self._target_stop_reason = self.TARGET_STOP_REASON_STEPPED
+                elif rec['payload']['reason'] == 'function-finished':
+                    self._target_stop_reason = self.TARGET_STOP_REASON_FN_FINISHED
                 elif rec['payload']['reason'] == 'signal-received':
                     if rec['payload']['signal-name'] == 'SIGINT':
                         self._target_stop_reason = self.TARGET_STOP_REASON_SIGINT
@@ -261,7 +264,19 @@ def exec_next(self):
         # -exec-next [--reverse]
         res,_ = self._mi_cmd_run('-exec-next')
         if res != 'running':
-            raise DebuggerError('Failed to step program!')
+            raise DebuggerError('Failed to step over!')
+
+    def exec_step(self):
+        # -exec-step [--reverse]
+        res,_ = self._mi_cmd_run('-exec-step')
+        if res != 'running':
+            raise DebuggerError('Failed to step in!')
+
+    def exec_finish(self):
+        # -exec-finish [--reverse]
+        res,_ = self._mi_cmd_run('-exec-finish')
+        if res != 'running':
+            raise DebuggerError('Failed to step out!')
 
     def data_eval_expr(self, expr):
         # -data-evaluate-expression expr

testing/esp/debug_backend_tests.py

@@ -209,13 +209,29 @@ def resume_exec(self, loc=None):
 
 
     def step(self):
-        """ Performs program step
+        """ Performs program step (step over, "next" command in GDB)
         """
         self.gdb.exec_next()
         self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_RUNNING, 5)
         rsn = self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_STOPPED, 5)
         self.assertEqual(rsn, dbg.Gdb.TARGET_STOP_REASON_STEPPED)
 
+    def step_in(self):
+        """ Performs program step (step in, "step" command in GDB)
+        """
+        self.gdb.exec_step()
+        self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_RUNNING, 5)
+        rsn = self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_STOPPED, 5)
+        self.assertEqual(rsn, dbg.Gdb.TARGET_STOP_REASON_STEPPED)
+
+    def step_out(self):
+        """ Runs until current function retunrs (step out, "finish" command in GDB)
+        """
+        self.gdb.exec_finish()
+        self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_RUNNING, 5)
+        rsn = self.gdb.wait_target_state(dbg.Gdb.TARGET_STATE_STOPPED, 5)
+        self.assertEqual(rsn, dbg.Gdb.TARGET_STOP_REASON_FN_FINISHED)
+
 class DebuggerTestAppTests(DebuggerTestsBase):
     """ Base class for tests which need special app running on target
     """