[LLDB][MIPS] Fix TestMiExec.py failure

[nitesh.jain]

Summary

Call to s_MyFunction may not follow immediately after g_MyFunction. There might be some instructions in between to restore caller-saved registers. We need to get past these instructions with a step to reach call to s_MyFunction.

[labath]

sounds reasonable

[ki.stfu]

Thanks for catching this! Could you update this CL to let me commit it?

packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

287–289 ↗

(On Diff #96105)

Remove this.

306–313 ↗

(On Diff #96105)

Please do like this.

325–336 ↗

(On Diff #96105)

it = self.expect(["\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"",
                  "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"29\""])
if it == 1:
    # Call to s_MyFunction may not follow immediately after g_MyFunction.  There might be
    # some instructions in between to restore caller-saved registers.   
    self.runCmd("-exec-step")
    self.expect("\^running")
    self.expect(
        "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"")

packages/Python/lldbsuite/test/tools/lldb-mi/control/main.cpp

29–30 ↗

(On Diff #96105)

Revert this

[nitesh.jain]

Update diff as per suggestion.

[nitesh.jain]

In D32340#733387, @ki.stfu wrote:

Thanks for catching this! Could you update this CL to let me commit it?

Yes , Please commit it.

Thanks

[ki.stfu]

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

329

I mistyped there should be -exec-next,, and why you are not checking that it has stopped at the right line (as I suggested)?

[nitesh.jain]

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

329

ohh. i just forgot to do that . I will update it

[nitesh.jain]

Hi Ki,

The changes has been committed (rL301537).

Thanks

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

def test_lldbmi_exec_step(self):
         self.runCmd("-exec-step --frame 0")
         self.expect("\^running")
         self.expect(
             "\*stopped,reason=\"end-stepping-range\".+?func=\"g_MyFunction.*?\"")
         # Use -exec-finish here to make sure that control reaches the caller.
         # -exec-step can keep us in the g_MyFunction for gcc
         self.runCmd("-exec-finish --frame 0")
         self.expect("\^running")
-        self.expect(
-            "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"")
+        it = self.expect(["\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"",
+                         "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"29\""])
+
+        if it == 1:
+            # Call to s_MyFunction may not follow immediately after g_MyFunction.
+            # There might be some instructions in between to restore caller-saved registers.
+            # We need to get past these instructions with a step to reach call to s_MyFunction.
+            self.runCmd("-exec-step --thread 1")
 
         # Test that -exec-step steps into s_MyFunction
         # (and that --frame is optional)
         self.runCmd("-exec-step --thread 1")
         self.expect("\^running")
         self.expect(
             "\*stopped,reason=\"end-stepping-range\".+?func=\".*?s_MyFunction.*?\"")