summaryrefslogtreecommitdiffstats
path: root/lldb/test/python_api/frame
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-10-22 20:06:20 +0000
committerZachary Turner <zturner@google.com>2015-10-22 20:06:20 +0000
commit77db4a855239049488e09f28c6665fdb3b51ef90 (patch)
tree11f22a87f27e28b3a71914ee3d80a039a79d2c9a /lldb/test/python_api/frame
parentbd832d513156cea8645f1c3da1296f791edfbbab (diff)
downloadbcm5719-llvm-77db4a855239049488e09f28c6665fdb3b51ef90.tar.gz
bcm5719-llvm-77db4a855239049488e09f28c6665fdb3b51ef90.zip
Update every test to import `lldb_shared`.
This is necessary in order to allow third party modules to be located under lldb/third_party rather than under the test folder directly. Since we're already touching every test file anyway, we also go ahead and delete the unittest2 import and main block wherever possible. The ability to run a test as a standalone file has already been broken for some time, and if we decide we want this back, we should use unittest instead of unittest2. A few places could not have the import of unittest2 removed,because they depend on the unittest2.expectedFailure or skip decorators. Removing all those was orthogonal in spirit to the purpose of this CL, so the import of unittest2 remains in those files that were using it for its test decorators. Those can be addressed separately. llvm-svn: 251055
Diffstat (limited to 'lldb/test/python_api/frame')
-rw-r--r--lldb/test/python_api/frame/TestFrames.py8
-rw-r--r--lldb/test/python_api/frame/inlines/TestInlinedFrame.py9
2 files changed, 2 insertions, 15 deletions
diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/test/python_api/frame/TestFrames.py
index 42fa8b9d1f4..b13edd09396 100644
--- a/lldb/test/python_api/frame/TestFrames.py
+++ b/lldb/test/python_api/frame/TestFrames.py
@@ -7,7 +7,6 @@ import lldb_shared
import os, time
import re
-import unittest2
import lldb, lldbutil
from lldbtest import *
@@ -200,10 +199,3 @@ class FrameAPITestCase(TestBase):
# The latest two frames should not be equal.
self.assertFalse(frameOutOfC.IsEqual(frameNow))
-
-
-if __name__ == '__main__':
- import atexit
- lldb.SBDebugger.Initialize()
- atexit.register(lambda: lldb.SBDebugger.Terminate())
- unittest2.main()
diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
index 98bd8e60109..e5e53918190 100644
--- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
@@ -2,9 +2,10 @@
Testlldb Python SBFrame APIs IsInlined() and GetFunctionName().
"""
+import lldb_shared
+
import os, time
import re
-import unittest2
import lldb, lldbutil
from lldbtest import *
@@ -73,9 +74,3 @@ class InlinedFrameAPITestCase(TestBase):
print stack_traces2
self.expect(stack_traces2, "Second stop at %s:%d" % (self.source, self.second_stop), exe=False,
substrs = ['%s:%d' % (self.source, self.second_stop)])
-
-if __name__ == '__main__':
- import atexit
- lldb.SBDebugger.Initialize()
- atexit.register(lambda: lldb.SBDebugger.Terminate())
- unittest2.main()
OpenPOWER on IntegriCloud