From d602e0d0cab270761553c79d2e42b8ac6b756157 Mon Sep 17 00:00:00 2001 From: Lawrence D'Anna Date: Tue, 22 Oct 2019 04:00:37 +0000 Subject: [PATCH] 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 --- .../ScriptInterpreter/Python/PythonDataObjectsTests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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(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(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): -- 2.7.4