[lldb] Start from end of previous substr when checking ordered substrs

[aeubanks]

Summary

I'm trying to add a test which tests that the same substr occurs twice in a row, but it matches even if only one of the substr occurs.

This found a bug in concurrent_base.py.

[DavidSpickett]

This LGTM.

lldb/packages/Python/lldbsuite/test/concurrent_base.py

class ConcurrentEventsBase(TestBase):
     def add_breakpoint(self, line, descriptions):
         """ Adds a breakpoint at self.filename:line and appends its description to descriptions, and
             returns the LLDB SBBreakpoint object.
         """
 
         bpno = lldbutil.run_break_set_by_file_and_line(
             self, self.filename, line, num_expected_locations=-1)
         bp = self.inferior_target.FindBreakpointByID(bpno)
-        descriptions.append(
-            ": file = 'main.cpp', line = %d" %
-            self.finish_breakpoint_line)
+        descriptions.append(": file = 'main.cpp', line = %d" % line)
         return bp
 
     def inferior_done(self):
         """ Returns true if the inferior is done executing all the event threads (and is stopped at self.finish_breakpoint,
             or has terminated execution.
         """
         return self.finish_breakpoint.GetHitCount() > 0 or \
             self.crash_count > 0 or \

lldb/packages/Python/lldbsuite/test/lldbtest.py

def expect(
             matched = output.endswith(endstr)
             log_lines.append("{} end string: \"{}\" ({})".format(
                     expecting_str, endstr, found_str(matched)))
 
         if substrs and matched == matching:
             start = 0
             for substr in substrs:
                 index = output[start:].find(substr)
-                start = start + index if ordered and matching else 0
+                start = start + index + len(substr) if ordered and matching else 0
                 matched = index != -1
                 log_lines.append("{} sub string: \"{}\" ({})".format(
                         expecting_str, substr, found_str(matched)))
 
                 if matched != matching:
                     break
 
         if patterns and matched == matching:

lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py

def test_with_run_command(self):
         self.expect("p strptr",
                     substrs=['ptr = "Hello world!"'])
 
         self.expect(
             "p (char*)\"1234567890123456789012345678901234567890123456789012345678901234ABC\"",
             substrs=[
                 '(char *) $',
                 ' = ptr = ',
-                ' "1234567890123456789012345678901234567890123456789012345678901234ABC"'])
+                '"1234567890123456789012345678901234567890123456789012345678901234ABC"'])
 
         self.runCmd("type summary add -c TestPoint")
 
         self.expect("frame variable iAmSomewhere",
                     substrs=['x = 4',
                              'y = 6'])
 
         self.expect("type summary list",