[LLDB][MIPS] Marking some expected failures

[mohit.bhakkad]

Summary

Most of the MIPS boards provide only one watchpoint register, so tests with more than one watchpoints will fail, as software watchpoints are not supported for MIPS yet.

Providing an alternate test for TestStepOverWatchpoint.py, in which checking one watchpoint, deleting it, then testing another watchpoint.

[tberghammer]

Instead of duplicating the test can you just change the existing one to remove the watchpoint in case we are running on mips?

[clayborg]

If this is indeed a very similar test, we should fix the original test to do the right thing.

[mohit.bhakkad]

Addressed comments

lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py

def setUp(self):
         # This is for verifying that watch location works.
         self.violating_func = "do_bad_thing_with_location";
         # Build dictionary to have unique executable names for each test method.
         self.exe_name = self.testMethodName
         self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
 
     @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
     @expectedFailureWindows("llvm.org/pr24446") # WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows
+    @expectedFailureAll(archs=['mips', 'mipsel', 'mips64', 'mips64el']) # Most of the MIPS boards provide only one H/W watchpoints, and S/W watchpoints are not supported yet
     def test_hello_watchlocation(self):
         """Test watching a location with '-s size' option."""
         self.build(dictionary=self.d)
         self.setTearDownCleanup(dictionary=self.d)
         exe = os.path.join(os.getcwd(), self.exe_name)
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.

lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py

def test(self):
 
         # resolve_location=True, read=True, write=False
         read_watchpoint = read_value.Watch(True, True, False, error)
         self.assertTrue(error.Success(),
                         "Error while setting watchpoint: %s" %
                         error.GetCString())
         self.assertTrue(read_watchpoint, "Failed to set read watchpoint.")
 
-        write_value = frame.FindValue('g_watch_me_write',
-                                      lldb.eValueTypeVariableGlobal)
-        self.assertTrue(write_value, "Failed to find write value.")
-
-        # resolve_location=True, read=False, write=True
-        write_watchpoint = write_value.Watch(True, False, True, error)
-        self.assertTrue(read_watchpoint, "Failed to set write watchpoint.")
-        self.assertTrue(error.Success(),
-                        "Error while setting watchpoint: %s" %
-                        error.GetCString())
-
         thread.StepOver()
         self.assertTrue(thread.GetStopReason() == lldb.eStopReasonWatchpoint,
                         STOPPED_DUE_TO_WATCHPOINT)
         self.assertTrue(thread.GetStopDescription(20) == 'watchpoint 1')
 
         process.Continue()
         self.assertTrue(process.GetState() == lldb.eStateStopped,
                         PROCESS_STOPPED)
         self.assertTrue(thread.GetStopDescription(20) == 'step over')
 
         self.step_inst_for_watchpoint(1)
 
+        write_value = frame.FindValue('g_watch_me_write',
+                                      lldb.eValueTypeVariableGlobal)
+        self.assertTrue(write_value, "Failed to find write value.")
+
+        # Most of the MIPS boards provide only one H/W watchpoints, and S/W watchpoints are not supported yet
+        arch = self.getArchitecture()
+        if arch in ['mips', 'mipsel', 'mips64', 'mips64el']:
+            self.runCmd("watchpoint delete 1")
+
+        # resolve_location=True, read=False, write=True
+        write_watchpoint = write_value.Watch(True, False, True, error)
+        self.assertTrue(read_watchpoint, "Failed to set write watchpoint.")
+        self.assertTrue(error.Success(),
+                        "Error while setting watchpoint: %s" %
+                        error.GetCString())
+
         thread.StepOver()
         self.assertTrue(thread.GetStopReason() == lldb.eStopReasonWatchpoint,
                         STOPPED_DUE_TO_WATCHPOINT)
         self.assertTrue(thread.GetStopDescription(20) == 'watchpoint 2')
 
         process.Continue()
         self.assertTrue(process.GetState() == lldb.eStateStopped,
                         PROCESS_STOPPED)