From: Lawrence D'Anna <lawrence_danna@apple.com>
Date: Tue, 22 Oct 2019 04:00:37 +0000 (+0000)
Subject: fix PythonDataObjectsTest.TestExceptions on windows
X-Git-Tag: llvmorg-11-init~5985
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d602e0d0cab270761553c79d2e42b8ac6b756157;p=platform%2Fupstream%2Fllvm.git

fix PythonDataObjectsTest.TestExceptions on windows

Looks like on windows googlemock regexes treat newlines differently
from on darwin.    This patch fixes the regex in this test so it
will work on both.

Fixes: https://reviews.llvm.org/D69214
llvm-svn: 375477
---

diff --git a/lldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp b/lldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp
index b676b42..7481482 100644
--- a/lldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp
+++ b/lldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp
@@ -805,13 +805,13 @@ main = foo
 
   PythonScript foo(script);
 
-  EXPECT_THAT_EXPECTED(foo(),
-                       llvm::Failed<PythonException>(testing::Property(
-                           &PythonException::ReadBacktrace,
-                           testing::ContainsRegex("line 3, in foo..*"
-                                                  "line 5, in bar.*"
-                                                  "line 7, in baz.*"
-                                                  "ZeroDivisionError"))));
+  EXPECT_THAT_EXPECTED(
+      foo(), llvm::Failed<PythonException>(testing::Property(
+                 &PythonException::ReadBacktrace,
+                 testing::AllOf(testing::ContainsRegex("line 3, in foo"),
+                                testing::ContainsRegex("line 5, in bar"),
+                                testing::ContainsRegex("line 7, in baz"),
+                                testing::ContainsRegex("ZeroDivisionError")))));
 
   static const char script2[] = R"(
 class MyError(Exception):