Updating tests that fail with ICC 13.1 because of the different mapping of assembly to DWARF.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187035 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/functionalities/longjmp/TestLongjmp.py b/test/functionalities/longjmp/TestLongjmp.py
index 6ab6d86..adb03ad 100644
--- a/test/functionalities/longjmp/TestLongjmp.py
+++ b/test/functionalities/longjmp/TestLongjmp.py
@@ -44,19 +44,21 @@
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', 'stop reason = breakpoint'])
+ def check_status(self):
+ # Note: Depending on the generated mapping of DWARF to assembly,
+ # the process may have stopped or exited.
+ self.expect("process status", PROCESS_STOPPED,
+ patterns = ['Process .*'])
+
def step_out(self):
self.start_test("do_jump")
-
self.runCmd("thread step-out", RUN_SUCCEEDED)
- self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* exited with status = 0'])
+ self.check_status()
def step_over(self):
self.start_test("do_jump")
-
self.runCmd("thread step-over", RUN_SUCCEEDED)
- self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* exited with status = 0'])
+ self.check_status()
def step_back_out(self):
self.start_test("main")
@@ -64,8 +66,7 @@
self.runCmd("thread step-over", RUN_SUCCEEDED)
self.runCmd("thread step-in", RUN_SUCCEEDED)
self.runCmd("thread step-out", RUN_SUCCEEDED)
- self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* exited with status = 0'])
+ self.check_status()
if __name__ == '__main__':
import atexit
diff --git a/test/functionalities/thread/step_out/TestThreadStepOut.py b/test/functionalities/thread/step_out/TestThreadStepOut.py
index becc913..47728e3 100644
--- a/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/test/functionalities/thread/step_out/TestThreadStepOut.py
@@ -53,10 +53,10 @@
TestBase.setUp(self)
# Find the line number for our breakpoint.
self.breakpoint = line_number('main.cpp', '// Set breakpoint here')
- if "gcc" in self.getCompiler():
- self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (gcc)')
- else:
+ if "clang" in self.getCompiler():
self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (clang)')
+ else:
+ self.step_out_destination = line_number('main.cpp', '// Expect to stop here after step-out (gcc)')
def step_out_single_thread_with_cmd(self):
self.step_out_with_cmd("this-thread")