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 --- .../data-formatter-script/TestDataFormatterScript.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py') diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py index 4eecda472c0..b025ba0dbd8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -165,10 +166,3 @@ class ScriptDataFormatterTestCase(TestBase): self.expect("frame variable array", substrs = ['Python summary']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() -- cgit v1.2.3