From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Fri, 31 Jan 2020 21:48:02 +0000 (-0800)
Subject: Revert "[lldb/Test] Make substrs argument to self.expect ordered."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f2a4c424e14e2564c64450d9416036ebe97b260;p=android-x86%2Fexternal-llvm-project.git

Revert "[lldb/Test] Make substrs argument to self.expect ordered."

Temporarily revert to fix the tests that only fail on the bots because
of the newly enforced substr order.
---

diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 933a99d5e14..602749c80fa 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2341,11 +2341,8 @@ FileCheck output:
         # Look for sub strings, if specified.
         keepgoing = matched if matching else not matched
         if substrs and keepgoing:
-            start = 0
             for substr in substrs:
-                index = output[start:].find(substr)
-                start = start + index if matching else 0
-                matched = index != -1
+                matched = output.find(substr) != -1
                 with recording(self, trace) as sbuf:
                     print("%s sub string: %s" % (heading, substr), file=sbuf)
                     print("Matched" if matched else "Not matched", file=sbuf)