From 52c5342ebcc173b25c1644335cba7aef8ec73b92 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Wed, 11 Dec 2019 09:14:52 -0800 Subject: update TestThreadStepOut.py to expect correct source line on arm64. --- .../test/functionalities/thread/step_out/TestThreadStepOut.py | 4 ++-- .../Python/lldbsuite/test/functionalities/thread/step_out/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lldb/packages/Python') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py index 80680768e3c..32a8afe36bd 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py @@ -71,9 +71,9 @@ class ThreadStepOutTestCase(TestBase): self.bkpt_string = '// Set breakpoint here' self.breakpoint = line_number('main.cpp', self.bkpt_string) - if "gcc" in self.getCompiler() or self.isIntelCompiler(): + if "gcc" in self.getCompiler() or self.isIntelCompiler() or self.getArchitecture() in ['arm64', 'arm64e']: self.step_out_destination = line_number( - 'main.cpp', '// Expect to stop here after step-out (icc and gcc)') + 'main.cpp', '// Expect to stop here after step-out (icc and gcc; arm64)') else: self.step_out_destination = line_number( 'main.cpp', '// Expect to stop here after step-out (clang)') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp index 96cea183ac6..e7754d0ac74 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp @@ -30,7 +30,7 @@ thread_func () step_out_of_here(); // Expect to stop here after step-out (clang) // Return - return NULL; // Expect to stop here after step-out (icc and gcc) + return NULL; // Expect to stop here after step-out (icc and gcc; arm64) } int main () -- cgit v1.2.3