summaryrefslogtreecommitdiffstats
path: root/lldb/test/logging/TestLogging.py
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/logging/TestLogging.py
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/logging/TestLogging.py')
-rw-r--r--lldb/test/logging/TestLogging.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/lldb/test/logging/TestLogging.py b/lldb/test/logging/TestLogging.py
index a76c149893d..ae8398f250e 100644
--- a/lldb/test/logging/TestLogging.py
+++ b/lldb/test/logging/TestLogging.py
@@ -2,8 +2,9 @@
Test lldb logging. This test just makes sure logging doesn't crash, and produces some output.
"""
+import lldb_shared
+
import os, time, string
-import unittest2
import lldb
from lldbtest import *
@@ -102,10 +103,3 @@ class LogTestCase(TestBase):
# check that it is still there
self.assertTrue(string.find(contents, "bacon") == 0)
-
-if __name__ == '__main__':
- import atexit
- lldb.SBDebugger.Initialize()
- atexit.register(lambda: lldb.SBDebugger.Terminate())
- unittest2.main()
-
OpenPOWER on IntegriCloud