[Lldb-commits] [lldb] r187035 - Updating tests that fail with ICC 13.1 because of the different mapping of assembly to DWARF.

[Malea, Daniel]

check_status doesn't seem to do anything -- is it required?


On 2013-07-24 9:24 AM, "Ashok Thirumurthi" <ashok.thirumurthi at intel.com>
wrote:

>Author: athirumu
>Date: Wed Jul 24 08:24:06 2013
>New Revision: 187035
>
>URL: http://llvm.org/viewvc/llvm-project?rev=187035&view=rev
>Log:
>Updating tests that fail with ICC 13.1 because of the different mapping
>of assembly to DWARF.
>
>Modified:
>    lldb/trunk/test/functionalities/longjmp/TestLongjmp.py
>    lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
>
>Modified: lldb/trunk/test/functionalities/longjmp/TestLongjmp.py
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/longjm
>p/TestLongjmp.py?rev=187035&r1=187034&r2=187035&view=diff
>==========================================================================
>====
>--- lldb/trunk/test/functionalities/longjmp/TestLongjmp.py (original)
>+++ lldb/trunk/test/functionalities/longjmp/TestLongjmp.py Wed Jul 24
>08:24:06 2013
>@@ -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
>
>Modified: 
>lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
>URL: 
>http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread
>/step_out/TestThreadStepOut.py?rev=187035&r1=187034&r2=187035&view=diff
>==========================================================================
>====
>--- lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
>(original)
>+++ lldb/trunk/test/functionalities/thread/step_out/TestThreadStepOut.py
>Wed Jul 24 08:24:06 2013
>@@ -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")
>
>
>_______________________________________________
>lldb-commits mailing list
>lldb-commits at cs.uiuc.edu
>http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits