diff options
| author | Zachary Turner <zturner@google.com> | 2015-03-26 18:59:56 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-03-26 18:59:56 +0000 |
| commit | 072964dc0d32bbd0bfa21f0c77dfb0fb1a29ce2c (patch) | |
| tree | 2d5583d7a170b16338e0fab224f375bcc18901ee | |
| parent | d8587b8ba6cb843c0833b3a6ff76cf935a47106a (diff) | |
| download | bcm5719-llvm-072964dc0d32bbd0bfa21f0c77dfb0fb1a29ce2c.tar.gz bcm5719-llvm-072964dc0d32bbd0bfa21f0c77dfb0fb1a29ce2c.zip | |
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.
llvm-svn: 233308
| -rw-r--r-- | lldb/test/functionalities/abbreviation/TestAbbreviations.py | 1 | ||||
| -rw-r--r-- | lldb/test/functionalities/load_unload/TestLoadUnload.py | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index aae1b8901fd..fbf8171c316 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -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: "]) diff --git a/lldb/test/functionalities/load_unload/TestLoadUnload.py b/lldb/test/functionalities/load_unload/TestLoadUnload.py index 96e0e16204f..e8f5ed7accb 100644 --- a/lldb/test/functionalities/load_unload/TestLoadUnload.py +++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py @@ -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]) |
