Author: Jason Molenda Date: 2019-12-11T09:17:03-08:00 New Revision: 52c5342ebcc173b25c1644335cba7aef8ec73b92
URL: https://github.com/llvm/llvm-project/commit/52c5342ebcc173b25c1644335cba7aef8ec73b92 DIFF: https://github.com/llvm/llvm-project/commit/52c5342ebcc173b25c1644335cba7aef8ec73b92.diff LOG: update TestThreadStepOut.py to expect correct source line on arm64. Added: Modified: lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp Removed: ################################################################################ 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 80680768e3ca..32a8afe36bdd 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 @@ def setUp(self): 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 96cea183ac66..e7754d0ac745 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 () _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
