[Lldb-commits] [lldb] r233989 - TestRecursiveInferior fixed on Linux

[Vince Harron]

Author: vharron
Date: Thu Apr  2 20:00:06 2015
New Revision: 233989

URL: http://llvm.org/viewvc/llvm-project?rev=233989&view=rev
Log:
TestRecursiveInferior fixed on Linux

Summary:
Updated test to reflect that Linux and Darwin behave the same now.

Removed @expectedFailureLinux for passing tests.

Test Plan: run tests

Reviewers: clayborg, sivachandra

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D8678


Modified:
    lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
    lldb/trunk/test/lldbtest.py

Modified: lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py?rev=233989&r1=233988&r2=233989&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py (original)
+++ lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py Thu Apr  2 20:00:06 2015
@@ -67,7 +67,6 @@ class CrashingRecursiveInferiorTestCase(
         self.recursive_inferior_crashing_step_after_break()
 
     @skipIfFreeBSD # llvm.org/pr16684
-    @expectedFailureLinux('llvm.org/pr16684')
     def test_recursive_inferior_crashing_step_after_break_dwarf(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.buildDwarf()
@@ -80,7 +79,6 @@ class CrashingRecursiveInferiorTestCase(
         self.recursive_inferior_crashing_expr_step_expr()
 
     @expectedFailureFreeBSD('llvm.org/pr15989') # Couldn't allocate space for the stack frame
-    @expectedFailureLinux('llvm.org/pr15989') # Couldn't allocate space for the stack frame
     def test_recursive_inferior_crashing_expr_step_and_expr_dwarf(self):
         """Test that lldb expressions work before and after stepping after a crash."""
         self.buildDwarf()
@@ -207,14 +205,16 @@ class CrashingRecursiveInferiorTestCase(
         self.check_stop_reason()
 
         expected_state = 'exited' # Provide the exit code.
-        if self.platformIsDarwin():
+        if self.platformIsDarwin() or self.platformIsLinux():
             expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
 
         self.expect("next",
             substrs = ['Process', expected_state])
 
-        if not self.platformIsDarwin(): # if stopped, we will have a process around
+        if expected_state == 'exited':
             self.expect("thread list", error=True,substrs = ['Process must be launched'])
+        else:
+            self.check_stop_reason()
 
     def recursive_inferior_crashing_expr_step_expr(self):
         """Test that lldb expressions work before and after stepping after a crash."""

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=233989&r1=233988&r2=233989&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Thu Apr  2 20:00:06 2015
@@ -1395,6 +1395,11 @@ class Base(unittest2.TestCase):
         platform_name = self.getPlatform()
         return platform_name in getDarwinOSTriples()
 
+    def platformIsLinux(self):
+        """Returns true if the OS triple for the selected platform is any valid apple OS"""
+        platform_name = self.getPlatform()
+        return platform_name == "linux"
+
     def getPlatform(self):
         """Returns the platform the test suite is running on."""
         platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]