From 77db4a855239049488e09f28c6665fdb3b51ef90 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 22 Oct 2015 20:06:20 +0000 Subject: 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 --- .../test/benchmarks/disassembly/TestDoAttachThenDisassembly.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py') diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py index 0f06497023e..a93a406f90f 100644 --- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py +++ b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py @@ -2,8 +2,9 @@ inferior and traverses the stack for thread0 to arrive at frame with function 'MainLoop'. It is important to specify an lldb executable as the inferior.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -66,10 +67,3 @@ class AttachThenDisassemblyBench(BenchBase): with self.stopwatch: # Disassemble the function. self.runCmd("disassemble -f") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() -- cgit v1.2.3