For the time being, let's bracket the test runner within the

lldb.SBDebugger.Initialize()/Terminate() pair.

Change TestHelp.py to use synchronous debugging, which is easier to work with.

llvm-svn: 107198

2 files changed, 11 insertions, 1 deletions

diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 5a06bb342d5..9d51816d9ef 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -129,4 +129,12 @@ for testdir in testdirs:
     os.path.walk(testdir, visit, 'Test')
 
 # Now that we have loaded all the test cases, run the whole test suite.
+
+# For the time being, let's bracket the test runner within the
+# lldb.SBDebugger.Initialize()/Terminate() pair.
+import lldb
+lldb.SBDebugger.Initialize()
+
 unittest.TextTestRunner(verbosity=verbose).run(suite)
+
+lldb.SBDebugger.Terminate()
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 70e496fde55..5b006efab8b 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -7,7 +7,7 @@ class TestHelpCommand(unittest.TestCase):
 
     def setUp(self):
         self.debugger = lldb.SBDebugger.Create()
-        self.debugger.SetAsync(True)
+        self.debugger.SetAsync(False)
         self.ci = self.debugger.GetCommandInterpreter()
         if not self.ci:
             raise Exception('Could not get the command interpreter')
@@ -37,4 +37,6 @@ class TestHelpCommand(unittest.TestCase):
 
 
 if __name__ == '__main__':
+    lldb.SBDebugger.Initialize()
     unittest.main()
+    lldb.SBDebugger.Terminate()