Skip to content

Commit b4a7b24

Browse files
authored
Merge pull request #6742 from apple/πŸ’/5.9/21be357873c0325495c7f6599259579735f54f3e+9dbce774eea515e400954f1d0ffbd858c839b546
πŸ’/5.9/21be357873c0325495c7f6599259579735f54f3e+9dbce774eea515e400954f1d0ffbd858c839b546
2 parents 4fabf01 + 1dd1c71 commit b4a7b24

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

β€Žlldb/unittests/ScriptInterpreter/Python/PythonDataObjectsTests.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,8 @@ main = foo
788788
testing::ContainsRegex("line 7, in baz"),
789789
testing::ContainsRegex("ZeroDivisionError")))));
790790

791+
#if !((defined(_WIN32) || defined(_WIN64)) && (defined(__aarch64__) || defined(_M_ARM64)))
792+
791793
static const char script2[] = R"(
792794
class MyError(Exception):
793795
def __str__(self):
@@ -800,10 +802,15 @@ def main():
800802

801803
PythonScript lol(script2);
802804

803-
EXPECT_THAT_EXPECTED(lol(),
804-
llvm::Failed<PythonException>(testing::Property(
805-
&PythonException::ReadBacktrace,
806-
testing::ContainsRegex("unprintable MyError"))));
805+
EXPECT_THAT_EXPECTED(
806+
lol(),
807+
llvm::Failed<PythonException>(testing::Property(
808+
&PythonException::ReadBacktrace,
809+
testing::AnyOf(
810+
testing::ContainsRegex("MyError: <exception str\\(\\) failed>"),
811+
testing::ContainsRegex("unprintable MyError")))));
812+
813+
#endif
807814
}
808815

809816
TEST_F(PythonDataObjectsTest, TestRun) {

0 commit comments

Comments
Β (0)