Rename `lldb_shared` to `use_lldb_suite`.
llvm-svn: 251444
diff --git a/lldb/test/android/platform/TestDefaultCacheLineSize.py b/lldb/test/android/platform/TestDefaultCacheLineSize.py
index d559dab..221ff48 100644
--- a/lldb/test/android/platform/TestDefaultCacheLineSize.py
+++ b/lldb/test/android/platform/TestDefaultCacheLineSize.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
index 206e3ec..dc844e3 100644
--- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
index b4d97bd..dff26f3 100644
--- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/api/multithreaded/TestMultithreaded.py b/lldb/test/api/multithreaded/TestMultithreaded.py
index 6be4bc1..7edaf1a 100644
--- a/lldb/test/api/multithreaded/TestMultithreaded.py
+++ b/lldb/test/api/multithreaded/TestMultithreaded.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/arm_emulation/TestEmulations.py b/lldb/test/arm_emulation/TestEmulations.py
index f4427cf..9ac1060f 100644
--- a/lldb/test/arm_emulation/TestEmulations.py
+++ b/lldb/test/arm_emulation/TestEmulations.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
index 8599124..a03eb42 100644
--- a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/benchmarks/disassembly/TestDisassembly.py b/lldb/test/benchmarks/disassembly/TestDisassembly.py
index 522be3a..69d645a 100644
--- a/lldb/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index c8a28b8..1e1c1d4 100644
--- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 913f9c0..4db2d08 100644
--- a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/expression/TestExpressionCmd.py b/lldb/test/benchmarks/expression/TestExpressionCmd.py
index b6c9d91..9540c0c 100644
--- a/lldb/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/test/benchmarks/expression/TestExpressionCmd.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
index f2c26b1..7811105 100644
--- a/lldb/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index 67d48f0..baad1c4 100644
--- a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/startup/TestStartupDelays.py b/lldb/test/benchmarks/startup/TestStartupDelays.py
index 217e98d..f95225b 100644
--- a/lldb/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/test/benchmarks/startup/TestStartupDelays.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index 3fbc787..cb85dd1 100644
--- a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
index 3fa01ae..c1b6e71 100644
--- a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index a1342bd..0c3d34f 100644
--- a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/dosep.py b/lldb/test/dosep.py
index 4124065..716adbc 100755
--- a/lldb/test/dosep.py
+++ b/lldb/test/dosep.py
@@ -34,7 +34,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
# system packages and modules
import asyncore
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index fde7a4f..7524ee4 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -22,7 +22,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import atexit
import commands
diff --git a/lldb/test/dotest_channels.py b/lldb/test/dotest_channels.py
index 111e628..e192287 100644
--- a/lldb/test/dotest_channels.py
+++ b/lldb/test/dotest_channels.py
@@ -16,7 +16,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import asyncore
import socket
diff --git a/lldb/test/driver/batch_mode/TestBatchMode.py b/lldb/test/driver/batch_mode/TestBatchMode.py
index f88591a..640f612 100644
--- a/lldb/test/driver/batch_mode/TestBatchMode.py
+++ b/lldb/test/driver/batch_mode/TestBatchMode.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
index ef04bdb..11caf62 100644
--- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
index cc66dd0..1cd2d83 100644
--- a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
+++ b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
index f851779..3b10128 100644
--- a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
@@ -9,7 +9,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
index e3d368c..38f0ab7 100644
--- a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
+++ b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/test/expression_command/call-throws/TestCallThatThrows.py
index 85774cd..874c9f7 100644
--- a/lldb/test/expression_command/call-throws/TestCallThatThrows.py
+++ b/lldb/test/expression_command/call-throws/TestCallThatThrows.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/char/TestExprsChar.py b/lldb/test/expression_command/char/TestExprsChar.py
index 0e6478a..cb57fdb 100644
--- a/lldb/test/expression_command/char/TestExprsChar.py
+++ b/lldb/test/expression_command/char/TestExprsChar.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
index 83c98af..f115f13 100644
--- a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/expression_command/formatters/TestFormatters.py b/lldb/test/expression_command/formatters/TestFormatters.py
index c8bb284..6fb6cd8 100644
--- a/lldb/test/expression_command/formatters/TestFormatters.py
+++ b/lldb/test/expression_command/formatters/TestFormatters.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/issue_11588/Test11588.py b/lldb/test/expression_command/issue_11588/Test11588.py
index 53b7fc9..5941cb5 100644
--- a/lldb/test/expression_command/issue_11588/Test11588.py
+++ b/lldb/test/expression_command/issue_11588/Test11588.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/options/TestExprOptions.py b/lldb/test/expression_command/options/TestExprOptions.py
index 846f676..2c0eb65 100644
--- a/lldb/test/expression_command/options/TestExprOptions.py
+++ b/lldb/test/expression_command/options/TestExprOptions.py
@@ -9,7 +9,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index b11ea8a..e959450 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
index 4c10e2a..8d3e31d 100644
--- a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
index 7e474c8..fdc8b68 100644
--- a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
index 3ed0384..48ee99f 100644
--- a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
+++ b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
index c6f270f..6790014 100644
--- a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
index 9603bb5..b50cc26 100644
--- a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
+++ b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/radar_8638051/Test8638051.py b/lldb/test/expression_command/radar_8638051/Test8638051.py
index a8ba021..3b61a46 100644
--- a/lldb/test/expression_command/radar_8638051/Test8638051.py
+++ b/lldb/test/expression_command/radar_8638051/Test8638051.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
index 41e3cf8..e7821a6 100644
--- a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
index 8538bb3..7d7c8ed 100644
--- a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/test/TestExprs.py b/lldb/test/expression_command/test/TestExprs.py
index 7b6d032..70d3689 100644
--- a/lldb/test/expression_command/test/TestExprs.py
+++ b/lldb/test/expression_command/test/TestExprs.py
@@ -13,7 +13,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
diff --git a/lldb/test/expression_command/test/TestExprs2.py b/lldb/test/expression_command/test/TestExprs2.py
index b835c08..672521d 100644
--- a/lldb/test/expression_command/test/TestExprs2.py
+++ b/lldb/test/expression_command/test/TestExprs2.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
index 59a1be6..6e3e887 100644
--- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index 6edf8be..7e67b33 100644
--- a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
index 3a089a2..469d9a5 100644
--- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
index 833229e..ba8a0a6 100644
--- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/archives/TestBSDArchives.py b/lldb/test/functionalities/archives/TestBSDArchives.py
index a2071d3..b51c3eb 100644
--- a/lldb/test/functionalities/archives/TestBSDArchives.py
+++ b/lldb/test/functionalities/archives/TestBSDArchives.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/asan/TestMemoryHistory.py b/lldb/test/functionalities/asan/TestMemoryHistory.py
index a0d8533..088a3a3 100644
--- a/lldb/test/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/test/functionalities/asan/TestMemoryHistory.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/asan/TestReportData.py b/lldb/test/functionalities/asan/TestReportData.py
index 462fc01..8bc931d 100644
--- a/lldb/test/functionalities/asan/TestReportData.py
+++ b/lldb/test/functionalities/asan/TestReportData.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/attach_resume/TestAttachResume.py b/lldb/test/functionalities/attach_resume/TestAttachResume.py
index 093fbd9..fa8c093 100644
--- a/lldb/test/functionalities/attach_resume/TestAttachResume.py
+++ b/lldb/test/functionalities/attach_resume/TestAttachResume.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
index 27ec682..0f1014a 100644
--- a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
+++ b/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
index 18c03f9..1b10e3a 100644
--- a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
+++ b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index 320a611..256f790 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
index f16588b..8399761 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import re
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index afc9f91..57b0f0f 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 95114ba..a60d559 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 3fe89f3..346a35c 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index 77b51ed..9000f8f 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 3f9a630..c57dae1 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index 3e03a40..a808e5f4 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
index c290bcb..850d12f 100644
--- a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
+++ b/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py b/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
index e4ef515..beebc0b 100644
--- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb, lldbutil
diff --git a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index febd619..87fc448 100644
--- a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
index fa618b8..ede32f5 100644
--- a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import re
diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index 65e7f1d..1a73489 100644
--- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index 73014c0..4358eeb 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
index 5cb9123..fd09794 100644
--- a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/command_history/TestCommandHistory.py b/lldb/test/functionalities/command_history/TestCommandHistory.py
index bb7d78f..e8a7ccd 100644
--- a/lldb/test/functionalities/command_history/TestCommandHistory.py
+++ b/lldb/test/functionalities/command_history/TestCommandHistory.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/command_regex/TestCommandRegex.py b/lldb/test/functionalities/command_regex/TestCommandRegex.py
index 128473a..98dfc97 100644
--- a/lldb/test/functionalities/command_regex/TestCommandRegex.py
+++ b/lldb/test/functionalities/command_regex/TestCommandRegex.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/command_script/TestCommandScript.py b/lldb/test/functionalities/command_script/TestCommandScript.py
index ba47ed8..f6875a4 100644
--- a/lldb/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/test/functionalities/command_script/TestCommandScript.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/command_script/import/TestImport.py b/lldb/test/functionalities/command_script/import/TestImport.py
index 37d5fbd..3a317d3 100644
--- a/lldb/test/functionalities/command_script/import/TestImport.py
+++ b/lldb/test/functionalities/command_script/import/TestImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
index f314ade..9f8aa1d 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py b/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py
index cd18e4c..8d8d7f1 100644
--- a/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py
+++ b/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py
@@ -1,4 +1,4 @@
-import lldb_shared
+import use_lldb_suite
import six
def command(debugger, command, result, internal_dict):
diff --git a/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py b/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py
index 9362011..e74686e 100644
--- a/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py
+++ b/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py
@@ -1,4 +1,4 @@
-import lldb_shared
+import use_lldb_suite
import six
def command(debugger, command, result, internal_dict):
diff --git a/lldb/test/functionalities/command_source/TestCommandSource.py b/lldb/test/functionalities/command_source/TestCommandSource.py
index 31862ac..c9aee18 100644
--- a/lldb/test/functionalities/command_source/TestCommandSource.py
+++ b/lldb/test/functionalities/command_source/TestCommandSource.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/functionalities/completion/TestCompletion.py b/lldb/test/functionalities/completion/TestCompletion.py
index 097c9f5..980d353 100644
--- a/lldb/test/functionalities/completion/TestCompletion.py
+++ b/lldb/test/functionalities/completion/TestCompletion.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
index 61de7ca..09674dd 100644
--- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
index 0d97a40..ebd7818 100644
--- a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
+++ b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
index 64c09e1..95b66e4 100644
--- a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
+++ b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index 0cf33ef..a9fe04d4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index 791cc26..e815061 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index 4414636..ffdd807 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index cb1163a..4eff86f 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index 0e6a58a..fe5a23b 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index 7310f85..e96d2de 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index 3ef22da..e0f7115 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index 1a4a7f3..e44dcb5 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
index 0600861..3300341 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
index 957c8db..d666e47 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 1347c43..1e6ef1c 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index 771e87c..c2d1c1b 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
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 41d080d..e27a2fa 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index 327a121..24406ec 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index 2ced549..fdc13f4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
index 6626539..25f02c8 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
index 6ef5149..7bd47c0 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
index 226cfb9..9a930b4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
index 65f0f5c..6939103 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
index 5ea67b2..5522fe3 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
index 231ff85..23c3514 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
index c341ce0..975c6fe 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
index 2c1b90b..d464678 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
index 0cb33b9..929aa99 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
index e307af7..306e389 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
index 057a8f6..67b4cf9 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
index ac5518a..e6eb21c 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
index ec31cd7..a307407 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
index 65d09e0..8fa99c5 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
index 0f1fde4..55d985c 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
index 3a6145b..3436ff6 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
index 0aba73f..8c7ba2b 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
index 22128e1..644e477 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index 694ebbe..bd9e533 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index 71296ec..d006c9a 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index 063fe38..b12e3b6 100644
--- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index 5726b3f..48a981b 100644
--- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index 77836ee..a735527 100644
--- a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
index a0154a4..e431fc0 100644
--- a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index b9afb60..5139088 100644
--- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index c5700a4..92e1a37 100644
--- a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
index 1fe3a60..11430ea 100644
--- a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
+++ b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
index ef94172..335cef3 100644
--- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
+++ b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index ebb3474..a7a1822 100644
--- a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
index 08aaea4..3e139c1 100644
--- a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
+++ b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index f60fd4b..9d752f0 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
index 794fd76..1add38c 100644
--- a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
+++ b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index c79cec3..13ea4d5 100644
--- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index cb3927b..9af60fc 100644
--- a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
+++ b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
index c4ce58d6..bbd246a 100644
--- a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
+++ b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index b69fe2e..5399b37 100644
--- a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/functionalities/dead-strip/TestDeadStrip.py
index 61e181c..8234974 100644
--- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
index 006832d..adf1b14 100644
--- a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
+++ b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
index df86306..a0f9f4d 100644
--- a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
+++ b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
index 542748e..0d6b39b 100644
--- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
+++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/exec/TestExec.py b/lldb/test/functionalities/exec/TestExec.py
index f7a5191..658f198 100644
--- a/lldb/test/functionalities/exec/TestExec.py
+++ b/lldb/test/functionalities/exec/TestExec.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import commands
import lldb
diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
index 377c7e7..e3b8e4a 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/fat_archives/TestFatArchives.py b/lldb/test/functionalities/fat_archives/TestFatArchives.py
index 40b8f25..ca72180 100644
--- a/lldb/test/functionalities/fat_archives/TestFatArchives.py
+++ b/lldb/test/functionalities/fat_archives/TestFatArchives.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import commands
import lldb
diff --git a/lldb/test/functionalities/format/TestFormats.py b/lldb/test/functionalities/format/TestFormats.py
index d4123ef..b2e8487 100644
--- a/lldb/test/functionalities/format/TestFormats.py
+++ b/lldb/test/functionalities/format/TestFormats.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
index ccf4d61..7bbeff6 100644
--- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb, lldbutil, lldbplatformutil
diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py
index 4cc630c..daf39e6 100644
--- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py
+++ b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
index 896221f..9fe146f 100644
--- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb, lldbutil, lldbplatformutil
diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 00ed361..310b3d7 100644
--- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb, lldbutil, lldbplatformutil
diff --git a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py
index 7b2c38d..70d92dc 100644
--- a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py
+++ b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, sys
import lldb
diff --git a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index 8ed08fc..2b25394 100644
--- a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os
diff --git a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
index 90e40ce..86e617f 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import os
diff --git a/lldb/test/functionalities/load_unload/TestLoadUnload.py b/lldb/test/functionalities/load_unload/TestLoadUnload.py
index 7f67fb5..29f6eff 100644
--- a/lldb/test/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/longjmp/TestLongjmp.py b/lldb/test/functionalities/longjmp/TestLongjmp.py
index b7294ed..b392f7a 100644
--- a/lldb/test/functionalities/longjmp/TestLongjmp.py
+++ b/lldb/test/functionalities/longjmp/TestLongjmp.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/memory/read/TestMemoryRead.py b/lldb/test/functionalities/memory/read/TestMemoryRead.py
index 9fbb56f..085c9bd 100644
--- a/lldb/test/functionalities/memory/read/TestMemoryRead.py
+++ b/lldb/test/functionalities/memory/read/TestMemoryRead.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index 3e1f21c..9ff01ab 100644
--- a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
@@ -3,7 +3,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
index 9e5bd71..f1ca5d5 100644
--- a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
+++ b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
index ea851c7..5648952 100644
--- a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os.path
import lldb
diff --git a/lldb/test/functionalities/paths/TestPaths.py b/lldb/test/functionalities/paths/TestPaths.py
index 3376fab..d001834 100644
--- a/lldb/test/functionalities/paths/TestPaths.py
+++ b/lldb/test/functionalities/paths/TestPaths.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import os
diff --git a/lldb/test/functionalities/platform/TestPlatformCommand.py b/lldb/test/functionalities/platform/TestPlatformCommand.py
index c049356..6333fdc 100644
--- a/lldb/test/functionalities/platform/TestPlatformCommand.py
+++ b/lldb/test/functionalities/platform/TestPlatformCommand.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
index 79654e0..e5a9581 100644
--- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
index a1d6176..d7ccfa3 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
+++ b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
index 379b27b..46dbb1d 100644
--- a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
+++ b/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/test/functionalities/process_attach/TestProcessAttach.py
index 023da13..d08dda2 100644
--- a/lldb/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py b/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
index bc0b850..e600b53 100644
--- a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
+++ b/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import time
diff --git a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py b/lldb/test/functionalities/process_group/TestChangeProcessGroup.py
index c31d817..8779e5e 100644
--- a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py
+++ b/lldb/test/functionalities/process_group/TestChangeProcessGroup.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
index 75b3a25..41aee66 100644
--- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py
+++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
index 8774ff7..9d33da6 100644
--- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/test/functionalities/register/TestRegisters.py
index b77ade7..5c07c5e 100755
--- a/lldb/test/functionalities/register/TestRegisters.py
+++ b/lldb/test/functionalities/register/TestRegisters.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import re
diff --git a/lldb/test/functionalities/rerun/TestRerun.py b/lldb/test/functionalities/rerun/TestRerun.py
index 63b92c9..0058e24 100644
--- a/lldb/test/functionalities/rerun/TestRerun.py
+++ b/lldb/test/functionalities/rerun/TestRerun.py
@@ -3,7 +3,7 @@
"""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import os
diff --git a/lldb/test/functionalities/return-value/TestReturnValue.py b/lldb/test/functionalities/return-value/TestReturnValue.py
index bf89573..88285b7 100644
--- a/lldb/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/test/functionalities/return-value/TestReturnValue.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/set-data/TestSetData.py b/lldb/test/functionalities/set-data/TestSetData.py
index c8b388f..720dae0 100644
--- a/lldb/test/functionalities/set-data/TestSetData.py
+++ b/lldb/test/functionalities/set-data/TestSetData.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py
index 0e3c10b..7ae62bc 100644
--- a/lldb/test/functionalities/signal/TestSendSignal.py
+++ b/lldb/test/functionalities/signal/TestSendSignal.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, signal
import lldb
diff --git a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py
index b938003..c60656a 100644
--- a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py
+++ b/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/signal/raise/TestRaise.py b/lldb/test/functionalities/signal/raise/TestRaise.py
index 8a976b6..fe9077c 100644
--- a/lldb/test/functionalities/signal/raise/TestRaise.py
+++ b/lldb/test/functionalities/signal/raise/TestRaise.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
index 111940e..b79645f 100644
--- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
+++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index 94ffaec..9087df6 100644
--- a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import re
diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
index 916faee..37ad2c2 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
index cba672e..89b9121 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
index a929ac6..f38f7a5 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
+++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/target_command/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py
index bf1d185..7ffc64c 100644
--- a/lldb/test/functionalities/target_command/TestTargetCommand.py
+++ b/lldb/test/functionalities/target_command/TestTargetCommand.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import sys
diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py
index 4ba3ed5..28d5181 100644
--- a/lldb/test/functionalities/thread/TestNumThreads.py
+++ b/lldb/test/functionalities/thread/TestNumThreads.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index 3ea2b5c..cf12693 100644
--- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
index af86dbf..80ebb7c 100644
--- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
@@ -12,7 +12,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index 81b3beb..e2fce43 100644
--- a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
index 344483b..6e363a3 100644
--- a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
+++ b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
index cee2735..0267f2e 100644
--- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index 760b950..261c524 100644
--- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
index 1f764af..d5e83dc 100644
--- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
+++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/jump/TestThreadJump.py b/lldb/test/functionalities/thread/jump/TestThreadJump.py
index 4a55aff..1c0b32d 100644
--- a/lldb/test/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/test/functionalities/thread/jump/TestThreadJump.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
index 59fa081..fc81fa9 100644
--- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
+++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py
index 0a434bf..dc20507 100644
--- a/lldb/test/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/test/functionalities/thread/state/TestThreadStates.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
index aa5d09e..7ef1460 100644
--- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
index facf1aa..89f65f9 100644
--- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
+++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
index 3b6407f..29d3c48 100644
--- a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
+++ b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/tty/TestTerminal.py b/lldb/test/functionalities/tty/TestTerminal.py
index b0e47bb..6cfc424 100644
--- a/lldb/test/functionalities/tty/TestTerminal.py
+++ b/lldb/test/functionalities/tty/TestTerminal.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/test/functionalities/type_completion/TestTypeCompletion.py
index ea1c011..9c2b33f 100644
--- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py
+++ b/lldb/test/functionalities/type_completion/TestTypeCompletion.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/type_lookup/TestTypeLookup.py b/lldb/test/functionalities/type_lookup/TestTypeLookup.py
index 26e56c9..e50b323 100644
--- a/lldb/test/functionalities/type_lookup/TestTypeLookup.py
+++ b/lldb/test/functionalities/type_lookup/TestTypeLookup.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
index 7b0fa13..0a85c59 100644
--- a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
index a4d25fa..6f8412c 100644
--- a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py b/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
index bba6a71..7b7cf41 100644
--- a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
+++ b/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
@@ -12,7 +12,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
index 01914a3..98733e5 100644
--- a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
+++ b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
index da48757..8b9da4e 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
index cfdcd72..87c2e20 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
index 48e5e98..b615fc7 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
index d64924e..a9d706f 100644
--- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 681d420..0c781bf 100644
--- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
index 24808f3..43ddf84 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index f89f76b..fc359ef 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
index 1960c76..d6af0c2 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index 919a8a4..eddef4c 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
index 0b32550..c19ee8f 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
index a594bbd..d6e5826 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index 7763e78..3ad9370 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
index b6f8091..aac278b 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index b25666c..90aa2c9 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/lang/c/anonymous/TestAnonymous.py
index 3f79233..539cb94 100644
--- a/lldb/test/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/test/lang/c/anonymous/TestAnonymous.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py
index f87f70ab..ecfe0c2 100644
--- a/lldb/test/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/test/lang/c/array_types/TestArrayTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py
index a459434..b9ae8a5 100644
--- a/lldb/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/test/lang/c/bitfields/TestBitfields.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/test/lang/c/blocks/TestBlocks.py
index 5ad48ec..fb32bf3 100644
--- a/lldb/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/test/lang/c/blocks/TestBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/lang/c/const_variables/TestConstVariables.py
index 2f3a763..a0471cc 100644
--- a/lldb/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/test/lang/c/const_variables/TestConstVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/enum_types/TestEnumTypes.py b/lldb/test/lang/c/enum_types/TestEnumTypes.py
index a8af960..46355a9 100644
--- a/lldb/test/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/test/lang/c/enum_types/TestEnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py
index 430f20b..0586859 100644
--- a/lldb/test/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py
index ab5d1bc..85a97d4 100644
--- a/lldb/test/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/lang/c/global_variables/TestGlobalVariables.py
index 92f2526..b75ef4f 100644
--- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/test/lang/c/global_variables/TestGlobalVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/modules/TestCModules.py b/lldb/test/lang/c/modules/TestCModules.py
index c35a687..0453aa8 100644
--- a/lldb/test/lang/c/modules/TestCModules.py
+++ b/lldb/test/lang/c/modules/TestCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/lang/c/register_variables/TestRegisterVariables.py
index 343dcc8..b203093 100644
--- a/lldb/test/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/test/lang/c/register_variables/TestRegisterVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py
index c568517..276d9ef 100644
--- a/lldb/test/lang/c/set_values/TestSetValues.py
+++ b/lldb/test/lang/c/set_values/TestSetValues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/shared_lib/TestSharedLib.py b/lldb/test/lang/c/shared_lib/TestSharedLib.py
index 0d47806..fedb1d6 100644
--- a/lldb/test/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/test/lang/c/shared_lib/TestSharedLib.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index e4dac28..549db3a 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
index 0e0c624..5048d01 100644
--- a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/stepping/TestThreadStepping.py b/lldb/test/lang/c/stepping/TestThreadStepping.py
index db8a726..fcc8428 100644
--- a/lldb/test/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/test/lang/c/stepping/TestThreadStepping.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
index 0959154..6236519 100644
--- a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/c/typedef/Testtypedef.py b/lldb/test/lang/c/typedef/Testtypedef.py
index fc8a5a6..f8f3393 100644
--- a/lldb/test/lang/c/typedef/Testtypedef.py
+++ b/lldb/test/lang/c/typedef/Testtypedef.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 72c01ad..3f788b7 100644
--- a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
index 0e55bab..b37c1bb 100644
--- a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
index 5bb5481..6d88585 100644
--- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py
index 3fda9e4..822a257 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index cbb3456..5a56f9d 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
index bcefda2..5d5d471 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
index 4f1cd5e..ee40cb1 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index a31519f..ec19c1b 100644
--- a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index babe4f2..452f988 100644
--- a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/namespace/TestNamespace.py b/lldb/test/lang/cpp/namespace/TestNamespace.py
index 40f1298..80a710b 100644
--- a/lldb/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/test/lang/cpp/namespace/TestNamespace.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
index df1b5ac..48d633e 100644
--- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
+++ b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
index 5bac76e..e677a24 100644
--- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
index aaf16d3..004ec28 100644
--- a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py
index 4c7636c..83cfd3e 100644
--- a/lldb/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/test/lang/cpp/stl/TestSTL.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
index 1ffb765..48cd0ae 100644
--- a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
index 9ac570e..577b038 100644
--- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index 9154cc6..a463bf5 100644
--- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
index 70cc028..d708747 100644
--- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/go/goroutines/TestGoroutines.py b/lldb/test/lang/go/goroutines/TestGoroutines.py
index b3cfb76..46d2e61 100644
--- a/lldb/test/lang/go/goroutines/TestGoroutines.py
+++ b/lldb/test/lang/go/goroutines/TestGoroutines.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/go/types/TestGoASTContext.py b/lldb/test/lang/go/types/TestGoASTContext.py
index ac4534a..a9d9745 100644
--- a/lldb/test/lang/go/types/TestGoASTContext.py
+++ b/lldb/test/lang/go/types/TestGoASTContext.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/mixed/TestMixedLanguages.py b/lldb/test/lang/mixed/TestMixedLanguages.py
index e791686..7aedc1d 100644
--- a/lldb/test/lang/mixed/TestMixedLanguages.py
+++ b/lldb/test/lang/mixed/TestMixedLanguages.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
index 2403823..291f7ec 100644
--- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
index 49c2995..38736e7 100644
--- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestConstStrings.py b/lldb/test/lang/objc/foundation/TestConstStrings.py
index 11726c9..67c643a 100644
--- a/lldb/test/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/test/lang/objc/foundation/TestConstStrings.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
index 6488b98..4ad2698 100644
--- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py
index 39af9af..2bf5b7f 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, os.path, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
index ccc93ca..ffa0d67 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
index 5fe59c2..85b0859 100644
--- a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
index 357346b..d04660d 100644
--- a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestSymbolTable.py b/lldb/test/lang/objc/foundation/TestSymbolTable.py
index 620ada6..0e2c5ed 100644
--- a/lldb/test/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/test/lang/objc/foundation/TestSymbolTable.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index 5b06ea2..9a16fd1 100644
--- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index a0c208b..30126eb 100644
--- a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
index c00d0d1..6538f3f 100644
--- a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index 12d4e37..f3d3633 100644
--- a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 22d0909..007de7e 100644
--- a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules/TestObjCModules.py b/lldb/test/lang/objc/modules/TestObjCModules.py
index f8ed11a..ed925c5 100644
--- a/lldb/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/test/lang/objc/modules/TestObjCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/objc++/TestObjCXX.py b/lldb/test/lang/objc/objc++/TestObjCXX.py
index b553035..29f52d2 100644
--- a/lldb/test/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/test/lang/objc/objc++/TestObjCXX.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index d02103c..c6dd996 100644
--- a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
index 3b07320..cf09d86 100644
--- a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
index e4708d6..39578d5 100644
--- a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
index 31db768..6c3c183 100644
--- a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index f6a7b74..75cf3e1 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index cc810d8..cc8573a 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 0be0150..edbce82 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index f49ad71..28b0fd7 100644
--- a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index afdbc61..78f5e5e 100644
--- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
index 28712b9..5ac34ec 100644
--- a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -9,7 +9,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/lang/objc/objc-property/TestObjCProperty.py
index 8329143..963923f 100644
--- a/lldb/test/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/test/lang/objc/objc-property/TestObjCProperty.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index d74c5a1..cd9f239 100644
--- a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index edd7743..4ce6774 100644
--- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
index be29114..3f72e7e 100644
--- a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 4d3386f..388117a 100644
--- a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
index b5a01f0..08126e2 100644
--- a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/lang/objc/objc-super/TestObjCSuper.py
index 414a1a8..ea9a2e5 100644
--- a/lldb/test/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/test/lang/objc/objc-super/TestObjCSuper.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/print-obj/TestPrintObj.py b/lldb/test/lang/objc/print-obj/TestPrintObj.py
index 440f0c4..4e6f923 100644
--- a/lldb/test/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/test/lang/objc/print-obj/TestPrintObj.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index dd8e967..8de6d2d 100644
--- a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
index 1b087c6..631d556 100644
--- a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
index b36b82f..79b7c3e 100644
--- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
index 81ec1a8..34054ff 100644
--- a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/lang/objc/real-definition/TestRealDefinition.py
index 8a87e09..3bf7bb7 100644
--- a/lldb/test/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/test/lang/objc/real-definition/TestRealDefinition.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
index 635aa85..3764f26 100644
--- a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 306c147..130afa8 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/lldbcurses.py b/lldb/test/lldbcurses.py
index f68577c..3ad7ccc 100644
--- a/lldb/test/lldbcurses.py
+++ b/lldb/test/lldbcurses.py
@@ -1,4 +1,4 @@
-import lldb_shared
+import use_lldb_suite
import curses, curses.panel
import sys
diff --git a/lldb/test/lldbpexpect.py b/lldb/test/lldbpexpect.py
index 6110b32..5fee6cf 100644
--- a/lldb/test/lldbpexpect.py
+++ b/lldb/test/lldbpexpect.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 1e108cd..8ab47fe 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -33,7 +33,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import abc
import gc
diff --git a/lldb/test/lldbutil.py b/lldb/test/lldbutil.py
index c7c8f22..0883c7d 100644
--- a/lldb/test/lldbutil.py
+++ b/lldb/test/lldbutil.py
@@ -6,7 +6,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import os, sys
diff --git a/lldb/test/logging/TestLogging.py b/lldb/test/logging/TestLogging.py
index 346b660..a738ba8 100644
--- a/lldb/test/logging/TestLogging.py
+++ b/lldb/test/logging/TestLogging.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, string
import lldb
diff --git a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
index e5d4202..4324f0b 100644
--- a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
+++ b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
index bd25db6..50f18b4 100644
--- a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
+++ b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
index cea7274..4ec5147 100644
--- a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/order/TestOrderFile.py b/lldb/test/macosx/order/TestOrderFile.py
index fee48e0..b768c3a 100644
--- a/lldb/test/macosx/order/TestOrderFile.py
+++ b/lldb/test/macosx/order/TestOrderFile.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/macosx/queues/TestQueues.py b/lldb/test/macosx/queues/TestQueues.py
index edd3ff0..879f6c3 100644
--- a/lldb/test/macosx/queues/TestQueues.py
+++ b/lldb/test/macosx/queues/TestQueues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index c24ccd5..cb9d7fb 100644
--- a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py
index d08c7c9..12e0939 100644
--- a/lldb/test/macosx/universal/TestUniversal.py
+++ b/lldb/test/macosx/universal/TestUniversal.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/progress.py b/lldb/test/progress.py
index bb71b4b..734627d 100755
--- a/lldb/test/progress.py
+++ b/lldb/test/progress.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import six
import sys
diff --git a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
index 4e984cc..c70b485 100644
--- a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
+++ b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
index 6366a79..00b2bcf 100644
--- a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
+++ b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 0e6e053..067d387 100644
--- a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -13,7 +13,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
index e5dcc49..131146b 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index 25f43e2..310d308 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/event/TestEvents.py b/lldb/test/python_api/event/TestEvents.py
index 773c189..f63ac13 100644
--- a/lldb/test/python_api/event/TestEvents.py
+++ b/lldb/test/python_api/event/TestEvents.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
index fbe43bc..0bc5257 100644
--- a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
index 807848f..9c83850 100644
--- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/test/python_api/frame/TestFrames.py
index 98f5062..8cc89f6 100644
--- a/lldb/test/python_api/frame/TestFrames.py
+++ b/lldb/test/python_api/frame/TestFrames.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
index 63288a8..314cc72 100644
--- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
index d66a66f..a967dc8 100644
--- a/lldb/test/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
index 1488e52..1b49ebc 100644
--- a/lldb/test/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/hello_world/TestHelloWorld.py b/lldb/test/python_api/hello_world/TestHelloWorld.py
index 430d4fb..263d41c 100644
--- a/lldb/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/test/python_api/hello_world/TestHelloWorld.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
index 3755bfb..e572567 100644
--- a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
index a9f735e..831c68a 100644
--- a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
index 5c4db48..d884254 100644
--- a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
index bb098b9..6c2dd4e 100644
--- a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
index f8a6533..0632779 100644
--- a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/module_section/TestModuleAndSection.py b/lldb/test/python_api/module_section/TestModuleAndSection.py
index d12f1ae..5af5453 100644
--- a/lldb/test/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/python_api/module_section/TestModuleAndSection.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/objc_type/TestObjCType.py b/lldb/test/python_api/objc_type/TestObjCType.py
index 1255d6f..f267c4b 100644
--- a/lldb/test/python_api/objc_type/TestObjCType.py
+++ b/lldb/test/python_api/objc_type/TestObjCType.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py
index 0f0d324..ad007d9 100644
--- a/lldb/test/python_api/process/TestProcessAPI.py
+++ b/lldb/test/python_api/process/TestProcessAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/test/python_api/process/io/TestProcessIO.py
index 2dc3f40..def9f5f 100644
--- a/lldb/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/python_api/process/io/TestProcessIO.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
index 5122a14..a2a2274 100644
--- a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/sbdata/TestSBData.py b/lldb/test/python_api/sbdata/TestSBData.py
index 304e8ab..536101b 100644
--- a/lldb/test/python_api/sbdata/TestSBData.py
+++ b/lldb/test/python_api/sbdata/TestSBData.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
index 39c055b..7e216c0 100644
--- a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/section/TestSectionAPI.py b/lldb/test/python_api/section/TestSectionAPI.py
index 4575f90..26002fb 100755
--- a/lldb/test/python_api/section/TestSectionAPI.py
+++ b/lldb/test/python_api/section/TestSectionAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
from lldbtest import *
diff --git a/lldb/test/python_api/signals/TestSignalsAPI.py b/lldb/test/python_api/signals/TestSignalsAPI.py
index 4dc8e65..3ee42de 100644
--- a/lldb/test/python_api/signals/TestSignalsAPI.py
+++ b/lldb/test/python_api/signals/TestSignalsAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/symbol-context/TestSymbolContext.py b/lldb/test/python_api/symbol-context/TestSymbolContext.py
index b34960ac..4fb3a8e 100644
--- a/lldb/test/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/python_api/symbol-context/TestSymbolContext.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/target/TestTargetAPI.py b/lldb/test/python_api/target/TestTargetAPI.py
index 8fbcc08..d3367aa 100644
--- a/lldb/test/python_api/target/TestTargetAPI.py
+++ b/lldb/test/python_api/target/TestTargetAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py
index e76bb65..8298420 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/python_api/thread/TestThreadAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/type/TestTypeList.py b/lldb/test/python_api/type/TestTypeList.py
index 9ea401a..5c79a95 100644
--- a/lldb/test/python_api/type/TestTypeList.py
+++ b/lldb/test/python_api/type/TestTypeList.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/TestValueAPI.py b/lldb/test/python_api/value/TestValueAPI.py
index d8776d5..525429b 100644
--- a/lldb/test/python_api/value/TestValueAPI.py
+++ b/lldb/test/python_api/value/TestValueAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
index 1b461d2..18c34d3 100644
--- a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
index 3ce749f..c62c130 100644
--- a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
index e6d6d30..b7f53c1 100644
--- a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
index 161804f..2e513a5 100644
--- a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
index af72f68..b2cb8de 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
index 031a4bf..c7bc94d 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 582e60e..8d0b4af 100644
--- a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 774288a..016ca78 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index 2051635..28a8f80 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index c48ef7b..da30201 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/settings/quoting/TestQuoting.py b/lldb/test/settings/quoting/TestQuoting.py
index 1c1bb8f..91a143f 100644
--- a/lldb/test/settings/quoting/TestQuoting.py
+++ b/lldb/test/settings/quoting/TestQuoting.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/source-manager/TestSourceManager.py b/lldb/test/source-manager/TestSourceManager.py
index 3301704..1fc6cd1 100644
--- a/lldb/test/source-manager/TestSourceManager.py
+++ b/lldb/test/source-manager/TestSourceManager.py
@@ -11,7 +11,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/terminal/TestSTTYBeforeAndAfter.py
index 79a40db..4032f023 100644
--- a/lldb/test/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/test/terminal/TestSTTYBeforeAndAfter.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/test_results.py b/lldb/test/test_results.py
index b6ef584..17dcc20 100644
--- a/lldb/test/test_results.py
+++ b/lldb/test/test_results.py
@@ -10,7 +10,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import argparse
import inspect
diff --git a/lldb/test/tools/lldb-mi/TestMiExit.py b/lldb/test/tools/lldb-mi/TestMiExit.py
index 4bed4cf..038710e 100644
--- a/lldb/test/tools/lldb-mi/TestMiExit.py
+++ b/lldb/test/tools/lldb-mi/TestMiExit.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiFile.py b/lldb/test/tools/lldb-mi/TestMiFile.py
index 7020b69..c48119c 100644
--- a/lldb/test/tools/lldb-mi/TestMiFile.py
+++ b/lldb/test/tools/lldb-mi/TestMiFile.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
index b7680e3..a3f5423 100644
--- a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
+++ b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
index bc4b7a9..caf9a49 100644
--- a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
+++ b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiPrompt.py b/lldb/test/tools/lldb-mi/TestMiPrompt.py
index e0038af..4f9e2ac 100644
--- a/lldb/test/tools/lldb-mi/TestMiPrompt.py
+++ b/lldb/test/tools/lldb-mi/TestMiPrompt.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
index f0beb08..056dd29 100644
--- a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/control/TestMiExec.py b/lldb/test/tools/lldb-mi/control/TestMiExec.py
index 41ccfc7..11f4e63 100644
--- a/lldb/test/tools/lldb-mi/control/TestMiExec.py
+++ b/lldb/test/tools/lldb-mi/control/TestMiExec.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/data/TestMiData.py b/lldb/test/tools/lldb-mi/data/TestMiData.py
index 8d7b370..94e5042 100644
--- a/lldb/test/tools/lldb-mi/data/TestMiData.py
+++ b/lldb/test/tools/lldb-mi/data/TestMiData.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
index 13797e0..594b759 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
+++ b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
index 0667b5f..ccdc642 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
+++ b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/test/tools/lldb-mi/lldbmi_testcase.py
index 071cf50..944dca0 100644
--- a/lldb/test/tools/lldb-mi/lldbmi_testcase.py
+++ b/lldb/test/tools/lldb-mi/lldbmi_testcase.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
index 545d568..d3f22c5 100644
--- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/test/tools/lldb-mi/stack/TestMiStack.py
index 921e5c2..1126f69 100644
--- a/lldb/test/tools/lldb-mi/stack/TestMiStack.py
+++ b/lldb/test/tools/lldb-mi/stack/TestMiStack.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
index 404309c..5f07e33 100644
--- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
index ca98822..8bbe552 100644
--- a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
index f51fff0..df40a81 100644
--- a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
+++ b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/test/tools/lldb-mi/target/TestMiTarget.py
index 92384db..d10051b 100644
--- a/lldb/test/tools/lldb-mi/target/TestMiTarget.py
+++ b/lldb/test/tools/lldb-mi/target/TestMiTarget.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
index e2c2cfd..a6e0878 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
+++ b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
@@ -5,7 +5,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/test/tools/lldb-mi/variable/TestMiVar.py
index 1978de1..d4973e4 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiVar.py
+++ b/lldb/test/tools/lldb-mi/variable/TestMiVar.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
index 0980b45..8ec7fd6 100644
--- a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
index b0e1e3f..9667c76 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index a1977be..5ca05ea 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index 7f3ecfc..e925918 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
index 2bfe3df..a6f1d14 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 3c3b3ff..9c2363a 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index c26ad96..ef2f3ca 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index 355f0cb..0155af5 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index 23ff0b8..e0ca9b1 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index bbea589..084bb44 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import sys
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
index 48189b3..267ce65 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
index fbde859..a254269 100644
--- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
@@ -12,7 +12,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import gdbremote_testcase
diff --git a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
index ee93e0b..68d2b2f 100644
--- a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py
index 7a780d8..8da1fda 100644
--- a/lldb/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import errno
import os
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index dd4a0f7..1f00a7d 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import signal
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 0ee76dd..7b3186b 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import signal
diff --git a/lldb/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
index a635878..8014a79 100644
--- a/lldb/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
@@ -3,7 +3,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import os.path
diff --git a/lldb/test/tools/lldb-server/socket_packet_pump.py b/lldb/test/tools/lldb-server/socket_packet_pump.py
index a6f42ed..1fd52bc 100644
--- a/lldb/test/tools/lldb-server/socket_packet_pump.py
+++ b/lldb/test/tools/lldb-server/socket_packet_pump.py
@@ -1,7 +1,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import re
import select
diff --git a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
index 6391d47..e21191f 100644
--- a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os.path
diff --git a/lldb/test/types/HideTestFailures.py b/lldb/test/types/HideTestFailures.py
index e08172d..77a04fe 100644
--- a/lldb/test/types/HideTestFailures.py
+++ b/lldb/test/types/HideTestFailures.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import sys
diff --git a/lldb/test/types/TestFloatTypes.py b/lldb/test/types/TestFloatTypes.py
index 6b519c1..133b98d 100644
--- a/lldb/test/types/TestFloatTypes.py
+++ b/lldb/test/types/TestFloatTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestFloatTypesExpr.py b/lldb/test/types/TestFloatTypesExpr.py
index 5d74b42..64f0197 100644
--- a/lldb/test/types/TestFloatTypesExpr.py
+++ b/lldb/test/types/TestFloatTypesExpr.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestIntegerTypes.py b/lldb/test/types/TestIntegerTypes.py
index bb26e88..bf1cd5c 100644
--- a/lldb/test/types/TestIntegerTypes.py
+++ b/lldb/test/types/TestIntegerTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestIntegerTypesExpr.py b/lldb/test/types/TestIntegerTypesExpr.py
index 5feb34d..27105c8 100644
--- a/lldb/test/types/TestIntegerTypesExpr.py
+++ b/lldb/test/types/TestIntegerTypesExpr.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestRecursiveTypes.py b/lldb/test/types/TestRecursiveTypes.py
index 34846ba..e394177 100644
--- a/lldb/test/types/TestRecursiveTypes.py
+++ b/lldb/test/types/TestRecursiveTypes.py
@@ -4,7 +4,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/lldb_shared.py b/lldb/test/use_lldb_suite.py
similarity index 80%
rename from lldb/test/lldb_shared.py
rename to lldb/test/use_lldb_suite.py
index 4d7a92d..daeafe8 100644
--- a/lldb/test/lldb_shared.py
+++ b/lldb/test/use_lldb_suite.py
@@ -17,6 +17,6 @@
lldb_root = find_lldb_root()
if lldb_root is not None:
import imp
- module = imp.find_module("lldb_shared_base", [lldb_root])
+ module = imp.find_module("use_lldb_suite_root", [lldb_root])
if module is not None:
- imp.load_module("lldb_shared_base", *module)
\ No newline at end of file
+ imp.load_module("use_lldb_suite_root", *module)
\ No newline at end of file
diff --git a/lldb/test/warnings/uuid/TestAddDsymCommand.py b/lldb/test/warnings/uuid/TestAddDsymCommand.py
index b474b60..8e5d31a 100644
--- a/lldb/test/warnings/uuid/TestAddDsymCommand.py
+++ b/lldb/test/warnings/uuid/TestAddDsymCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/third_party/Python/module/unittest2/unittest2/result.py b/lldb/third_party/Python/module/unittest2/unittest2/result.py
index af31fbf..2e4994d 100644
--- a/lldb/third_party/Python/module/unittest2/unittest2/result.py
+++ b/lldb/third_party/Python/module/unittest2/unittest2/result.py
@@ -1,6 +1,6 @@
"""Test result object"""
-import lldb_shared
+import use_lldb_suite
import sys
import traceback
diff --git a/lldb/lldb_shared_base.py b/lldb/use_lldb_suite_root.py
similarity index 100%
rename from lldb/lldb_shared_base.py
rename to lldb/use_lldb_suite_root.py