Updating tests that fail with ICC 13.1 because of the different mapping of assembly to DWARF.

llvm-svn: 187035
This commit is contained in:
Ashok Thirumurthi 2013-07-24 13:24:06 +00:00
parent 86e4b41169
commit 073842bde1
2 changed files with 12 additions and 11 deletions

View File

@ -44,19 +44,21 @@ class LongjmpTestCase(TestBase):
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 @@ class LongjmpTestCase(TestBase):
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

View File

@ -53,10 +53,10 @@ class ThreadStepOutTestCase(TestBase):
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")