[Lldb-commits] [lldb] r233279 - Fix RegisterCommandsTestCase and HelloWorldTestCase tests which hang on OS X after TestBase.tearDown()

[Ilia K]

Author: ki.stfu
Date: Thu Mar 26 10:43:46 2015
New Revision: 233279

URL: http://llvm.org/viewvc/llvm-project?rev=233279&view=rev
Log:
Fix RegisterCommandsTestCase and HelloWorldTestCase tests which hang on OS X after TestBase.tearDown()


Modified:
    lldb/trunk/test/functionalities/register/TestRegisters.py
    lldb/trunk/test/python_api/hello_world/TestHelloWorld.py

Modified: lldb/trunk/test/functionalities/register/TestRegisters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/register/TestRegisters.py?rev=233279&r1=233278&r2=233279&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/register/TestRegisters.py (original)
+++ lldb/trunk/test/functionalities/register/TestRegisters.py Thu Mar 26 10:43:46 2015
@@ -17,6 +17,10 @@ class RegisterCommandsTestCase(TestBase)
         TestBase.setUp(self)
         self.has_teardown = False
 
+    def tearDown(self):
+        self.dbg.GetSelectedTarget().GetProcess().Destroy()
+        TestBase.tearDown(self)
+
     def test_register_commands(self):
         """Test commands related to registers, in particular vector registers."""
         if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']:

Modified: lldb/trunk/test/python_api/hello_world/TestHelloWorld.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/hello_world/TestHelloWorld.py?rev=233279&r1=233278&r2=233279&view=diff
==============================================================================
--- lldb/trunk/test/python_api/hello_world/TestHelloWorld.py (original)
+++ lldb/trunk/test/python_api/hello_world/TestHelloWorld.py Thu Mar 26 10:43:46 2015
@@ -93,6 +93,12 @@ class HelloWorldTestCase(TestBase):
         self.line1 = line_number('main.c', '// Set break point at this line.')
         self.line2 = line_number('main.c', '// Waiting to be attached...')
 
+    def tearDown(self):
+        # Destroy process before TestBase.tearDown()
+        self.dbg.GetSelectedTarget().GetProcess().Destroy()
+        # Call super's tearDown().
+        TestBase.tearDown(self)
+
     def hello_world_python(self):
         """Create target, breakpoint, launch a process, and then kill it."""