[Lldb-commits] [lldb] r233308 - Fix the remaining two test failures caused by re-ordering of teardown.

[Zachary Turner]

Author: zturner
Date: Thu Mar 26 13:59:56 2015
New Revision: 233308

URL: http://llvm.org/viewvc/llvm-project?rev=233308&view=rev
Log:
Fix the remaining two test failures caused by re-ordering of teardown.

Previously we were using teardown hooks in these two instances to
shutdown processes.  TestBase already deletes all targets in its
own teardown, which will kill processes, so these steps weren't
necessary.

Modified:
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
    lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=233308&r1=233307&r2=233308&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Thu Mar 26 13:59:56 2015
@@ -137,7 +137,6 @@ class AbbreviationsTestCase(TestBase):
         # The test framework relies on detecting either "run" or "process launch"
         # command to automatically kill the inferior upon tear down.
         # But we'll be using "pro la" command to launch the inferior.
-        self.addTearDownHook(lambda: self.runCmd("process kill"))
         self.expect("pro la",
                     patterns = [ "Process .* launched: "])
 

Modified: lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py?rev=233308&r1=233307&r2=233308&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py (original)
+++ lldb/trunk/test/functionalities/load_unload/TestLoadUnload.py Thu Mar 26 13:59:56 2015
@@ -58,10 +58,6 @@ class LoadUnloadTestCase(TestBase):
         #    patterns = ["%s-[^-]*-[^-]*" % self.getArchitecture()])
         # Add an image search path substitution pair.
         self.runCmd("target modules search-paths add %s %s" % (os.getcwd(), new_dir))
-        # Add teardown hook to clear image-search-paths after the test.
-        # rdar://problem/10501020
-        # Uncomment the following to reproduce 10501020.
-        self.addTearDownHook(lambda: self.runCmd("target modules search-paths clear"))
 
         self.expect("target modules search-paths list",
             substrs = [os.getcwd(), new_dir])