summaryrefslogtreecommitdiffstats
path: root/lldb/test/functionalities
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/test/functionalities')
-rw-r--r--lldb/test/functionalities/abbreviation/TestAbbreviations.py2
-rw-r--r--lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py2
-rw-r--r--lldb/test/functionalities/archives/TestBSDArchives.py2
-rw-r--r--lldb/test/functionalities/asan/TestMemoryHistory.py2
-rw-r--r--lldb/test/functionalities/asan/TestReportData.py2
-rw-r--r--lldb/test/functionalities/attach_resume/TestAttachResume.py2
-rw-r--r--lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py2
-rw-r--r--lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py2
-rw-r--r--lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py2
-rw-r--r--lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py2
-rw-r--r--lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py2
-rw-r--r--lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py2
-rw-r--r--lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py2
-rw-r--r--lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py2
-rw-r--r--lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py2
-rw-r--r--lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py2
-rw-r--r--lldb/test/functionalities/command_history/TestCommandHistory.py2
-rw-r--r--lldb/test/functionalities/command_regex/TestCommandRegex.py2
-rw-r--r--lldb/test/functionalities/command_script/TestCommandScript.py2
-rw-r--r--lldb/test/functionalities/command_script/import/TestImport.py2
-rw-r--r--lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py2
-rw-r--r--lldb/test/functionalities/command_script/import/thepackage/TPunitA.py2
-rw-r--r--lldb/test/functionalities/command_script/import/thepackage/TPunitB.py2
-rw-r--r--lldb/test/functionalities/command_source/TestCommandSource.py2
-rw-r--r--lldb/test/functionalities/completion/TestCompletion.py2
-rw-r--r--lldb/test/functionalities/conditional_break/TestConditionalBreak.py2
-rw-r--r--lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py2
-rw-r--r--lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py2
-rw-r--r--lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py2
-rw-r--r--lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py2
-rw-r--r--lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py2
-rw-r--r--lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py2
-rw-r--r--lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py2
-rw-r--r--lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py2
-rw-r--r--lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py2
-rw-r--r--lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py2
-rw-r--r--lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py2
-rw-r--r--lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py2
-rw-r--r--lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py2
-rw-r--r--lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py2
-rw-r--r--lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py2
-rw-r--r--lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py2
-rw-r--r--lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py2
-rw-r--r--lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py2
-rw-r--r--lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py2
-rw-r--r--lldb/test/functionalities/dead-strip/TestDeadStrip.py2
-rw-r--r--lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py2
-rw-r--r--lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py2
-rw-r--r--lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py2
-rw-r--r--lldb/test/functionalities/exec/TestExec.py2
-rw-r--r--lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py2
-rw-r--r--lldb/test/functionalities/fat_archives/TestFatArchives.py2
-rw-r--r--lldb/test/functionalities/format/TestFormats.py2
-rw-r--r--lldb/test/functionalities/inferior-assert/TestInferiorAssert.py2
-rw-r--r--lldb/test/functionalities/inferior-changed/TestInferiorChanged.py2
-rw-r--r--lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py2
-rw-r--r--lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py2
-rw-r--r--lldb/test/functionalities/inline-stepping/TestInlineStepping.py2
-rw-r--r--lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py2
-rw-r--r--lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py2
-rw-r--r--lldb/test/functionalities/load_unload/TestLoadUnload.py2
-rw-r--r--lldb/test/functionalities/longjmp/TestLongjmp.py2
-rw-r--r--lldb/test/functionalities/memory/read/TestMemoryRead.py2
-rw-r--r--lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py2
-rw-r--r--lldb/test/functionalities/nosucharch/TestNoSuchArch.py2
-rw-r--r--lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py2
-rw-r--r--lldb/test/functionalities/paths/TestPaths.py2
-rw-r--r--lldb/test/functionalities/platform/TestPlatformCommand.py2
-rw-r--r--lldb/test/functionalities/plugins/commands/TestPluginCommands.py2
-rw-r--r--lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py2
-rw-r--r--lldb/test/functionalities/postmortem/minidump/TestMiniDump.py2
-rw-r--r--lldb/test/functionalities/process_attach/TestProcessAttach.py2
-rw-r--r--lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py2
-rw-r--r--lldb/test/functionalities/process_group/TestChangeProcessGroup.py2
-rw-r--r--lldb/test/functionalities/process_launch/TestProcessLaunch.py2
-rw-r--r--lldb/test/functionalities/recursion/TestValueObjectRecursion.py2
-rwxr-xr-xlldb/test/functionalities/register/TestRegisters.py2
-rw-r--r--lldb/test/functionalities/rerun/TestRerun.py2
-rw-r--r--lldb/test/functionalities/return-value/TestReturnValue.py2
-rw-r--r--lldb/test/functionalities/set-data/TestSetData.py2
-rw-r--r--lldb/test/functionalities/signal/TestSendSignal.py2
-rw-r--r--lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py2
-rw-r--r--lldb/test/functionalities/signal/raise/TestRaise.py2
-rw-r--r--lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py2
-rw-r--r--lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py2
-rw-r--r--lldb/test/functionalities/stop-hook/TestStopHookCmd.py2
-rw-r--r--lldb/test/functionalities/stop-hook/TestStopHookMechanism.py2
-rw-r--r--lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py2
-rw-r--r--lldb/test/functionalities/target_command/TestTargetCommand.py2
-rw-r--r--lldb/test/functionalities/thread/TestNumThreads.py2
-rw-r--r--lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py2
-rw-r--r--lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py2
-rw-r--r--lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py2
-rw-r--r--lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py2
-rw-r--r--lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py2
-rw-r--r--lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py2
-rw-r--r--lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py2
-rw-r--r--lldb/test/functionalities/thread/jump/TestThreadJump.py2
-rw-r--r--lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py2
-rw-r--r--lldb/test/functionalities/thread/state/TestThreadStates.py2
-rw-r--r--lldb/test/functionalities/thread/step_out/TestThreadStepOut.py2
-rw-r--r--lldb/test/functionalities/thread/thread_exit/TestThreadExit.py2
-rw-r--r--lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py2
-rw-r--r--lldb/test/functionalities/tty/TestTerminal.py2
-rw-r--r--lldb/test/functionalities/type_completion/TestTypeCompletion.py2
-rw-r--r--lldb/test/functionalities/type_lookup/TestTypeLookup.py2
-rw-r--r--lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py2
-rw-r--r--lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py2
-rw-r--r--lldb/test/functionalities/unwind/standard/TestStandardUnwind.py2
-rw-r--r--lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py2
-rw-r--r--lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py2
-rw-r--r--lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py2
-rw-r--r--lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py2
-rw-r--r--lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py2
-rw-r--r--lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py2
-rw-r--r--lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py2
164 files changed, 164 insertions, 164 deletions
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
index 3a089a23c2e..469d9a5c789 100644
--- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
@@ -4,7 +4,7 @@ Test some lldb command abbreviations and aliases for proper resolution.
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 833229e06b0..ba8a0a66013 100644
--- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
@@ -5,7 +5,7 @@ many commands remain available even after we add/delete commands in the future.
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 a2071d3bad4..b51c3ebe510 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 a0d853345cc..088a3a3262b 100644
--- a/lldb/test/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/test/functionalities/asan/TestMemoryHistory.py
@@ -4,7 +4,7 @@ Test that ASan memory history provider returns correct stack traces
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 462fc015179..8bc931df6e0 100644
--- a/lldb/test/functionalities/asan/TestReportData.py
+++ b/lldb/test/functionalities/asan/TestReportData.py
@@ -4,7 +4,7 @@ Test the AddressSanitizer runtime support for report breakpoint and data extract
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 093fbd92c2b..fa8c093d1c1 100644
--- a/lldb/test/functionalities/attach_resume/TestAttachResume.py
+++ b/lldb/test/functionalities/attach_resume/TestAttachResume.py
@@ -4,7 +4,7 @@ Test process attach/resume.
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 27ec6829aaf..0f1014a8182 100644
--- a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
+++ b/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
@@ -4,7 +4,7 @@ Test whether a process started by lldb has no extra file descriptors open.
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 18c03f9725c..1b10e3a250d 100644
--- a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
+++ b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
@@ -4,7 +4,7 @@ Test that backticks without a target should work (not infinite looping).
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 320a6113b5c..256f790de57 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -4,7 +4,7 @@ Test lldb breakpoint command add/list/delete.
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 f16588b16d2..83997617f0e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
@@ -4,7 +4,7 @@ Test that you can set breakpoint commands successfully with the Python API's:
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 afc9f91eb30..57b0f0f405e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
@@ -4,7 +4,7 @@ Test _regexp-break command which uses regular expression matching to dispatch to
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 95114ba4300..a60d559965e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -4,7 +4,7 @@ Test breakpoint conditions with 'breakpoint modify -c <expr> id'.
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 3fe89f32813..346a35c7835 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -4,7 +4,7 @@ Test lldb breakpoint ids.
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 77b51ed7226..9000f8f47a9 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 @@ Test breakpoint ignore count features.
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 3f9a630945e..c57dae18471 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -4,7 +4,7 @@ Test breakpoint commands for a breakpoint ID with multiple locations.
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 3e03a40e46b..a808e5f4fdd 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -4,7 +4,7 @@ Test breakpoint command for different options.
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 c290bcb785b..850d12fa732 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 @@ Test breakpoint command with AT_comp_dir set to symbolic link.
"""
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 e4ef5154a48..beebc0b1301 100644
--- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
@@ -4,7 +4,7 @@ Test continue from a breakpoint when there is a breakpoint on the next instructi
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 febd6190d86..87fc4488c36 100644
--- a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -4,7 +4,7 @@ Test lldb breakpoint ids.
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 fa618b8e497..ede32f58ed1 100644
--- a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
@@ -4,7 +4,7 @@ Test that you can set breakpoint and hit the C++ language exception breakpoint
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 65e7f1d50e4..1a734890974 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 @@ Test breakpoint commands set before we have a target
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 73014c026ac..4358eeb02b6 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -5,7 +5,7 @@ another source file) works correctly.
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 5cb91239925..fd09794b474 100644
--- a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
@@ -5,7 +5,7 @@ parser.
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 bb7d78fb4ac..e8a7ccdfa00 100644
--- a/lldb/test/functionalities/command_history/TestCommandHistory.py
+++ b/lldb/test/functionalities/command_history/TestCommandHistory.py
@@ -4,7 +4,7 @@ Test the command history mechanism
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 128473a36bd..98dfc9765b5 100644
--- a/lldb/test/functionalities/command_regex/TestCommandRegex.py
+++ b/lldb/test/functionalities/command_regex/TestCommandRegex.py
@@ -4,7 +4,7 @@ Test lldb 'commands regex' command which allows the user to create a regular exp
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 ba47ed8d959..f6875a4b4ca 100644
--- a/lldb/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/test/functionalities/command_script/TestCommandScript.py
@@ -4,7 +4,7 @@ Test lldb Python commands.
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 37d5fbd2be0..3a317d358df 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 f314adebefb..9f8aa1dc326 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 cd18e4cfc95..8d8d7f1c53f 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 936201157ac..e74686ed619 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 31862ac9bf5..c9aee18cad1 100644
--- a/lldb/test/functionalities/command_source/TestCommandSource.py
+++ b/lldb/test/functionalities/command_source/TestCommandSource.py
@@ -6,7 +6,7 @@ See also http://llvm.org/viewvc/llvm-project?view=rev&revision=109673.
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 097c9f572f7..980d353d26c 100644
--- a/lldb/test/functionalities/completion/TestCompletion.py
+++ b/lldb/test/functionalities/completion/TestCompletion.py
@@ -4,7 +4,7 @@ Test the lldb command line completion mechanism.
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 61de7cae798..09674dd3516 100644
--- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
@@ -4,7 +4,7 @@ Test conditionally break on a function and inspect its variables.
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 0d97a407213..ebd78182835 100644
--- a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
+++ b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 64c09e1fdbc..95b66e43700 100644
--- a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
+++ b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 0cf33efffb8..a9fe04d480d 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 @@ Test lldb data formatter subsystem.
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 791cc267a46..e8150610a3e 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 @@ Test lldb data formatter subsystem.
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 441463636a1..ffdd8078b23 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 @@ Test lldb data formatter subsystem.
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 cb1163a405c..4eff86f3860 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 @@ Test lldb data formatter subsystem.
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 0e6a58a25a6..fe5a23b2749 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 @@ Test lldb data formatter subsystem.
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 7310f8599d0..e96d2de5165 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 @@ Test lldb data formatter subsystem.
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 3ef22dad37d..e0f711598af 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 @@ Test lldb data formatter subsystem.
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 1a4a7f39671..e44dcb53eeb 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 @@ Test lldb data formatter subsystem.
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 0600861334c..3300341825f 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 @@ Test lldb data formatter subsystem.
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 957c8dbe057..d666e476f75 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 @@ Test lldb data formatter subsystem.
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 1347c43de68..1e6ef1c6360 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 @@ Test lldb data formatter subsystem.
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 771e87c2f2b..c2d1c1b2551 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 @@ Test lldb data formatter subsystem.
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 41d080d6b80..e27a2faabfb 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 @@ Test lldb data formatter subsystem.
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 327a121a4ae..24406ecf763 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 @@ Test lldb data formatter subsystem.
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 2ced549edb5..fdc13f47e73 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 @@ Test lldb data formatter subsystem.
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 6626539504f..25f02c83781 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 @@ Test lldb data formatter subsystem.
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 6ef51493543..7bd47c0e900 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 @@ Test lldb data formatter subsystem.
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 226cfb94edb..9a930b4c1d1 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 @@ Test lldb data formatter subsystem.
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 65f0f5c12ea..69391030750 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 @@ corruption).
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 5ea67b273e3..5522fe3fe26 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 @@ Test lldb data formatter subsystem.
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 231ff85ab1c..23c351420c7 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 @@ Test lldb data formatter subsystem.
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 c341ce027b3..975c6fe6af1 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 @@ Test lldb data formatter subsystem.
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 2c1b90b69a2..d4646786c27 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 @@ Test lldb data formatter subsystem.
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 0cb33b92f67..929aa99b42d 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 @@ Test lldb data formatter subsystem.
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 e307af7f63f..306e389de26 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 @@ Test lldb data formatter subsystem.
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 057a8f606d9..67b4cf95148 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 @@ Test lldb data formatter subsystem.
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 ac5518a6a01..e6eb21c4b50 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 @@ Test lldb data formatter subsystem.
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 ec31cd789c8..a3074073065 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 @@ Test lldb data formatter subsystem.
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 65d09e01103..8fa99c5b762 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 @@ Test lldb data formatter subsystem.
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 0f1fde45148..55d985c2c54 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 @@ Test lldb data formatter subsystem.
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 3a6145b11ba..3436ff69a45 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 @@ Test lldb data formatter subsystem.
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 0aba73faa8e..8c7ba2b36a7 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 @@ Test lldb data formatter subsystem.
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 22128e16907..644e477edd6 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 @@ Test lldb data formatter subsystem.
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 694ebbe17f0..bd9e5334818 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 @@ Test lldb data formatter subsystem.
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 71296ecf459..d006c9a95b7 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 @@ Test lldb data formatter subsystem.
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 063fe382d9e..b12e3b66336 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 @@ Check if changing Format on an SBValue correctly propagates that new format to c
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 5726b3fd0ee..48a981b0ede 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 @@ Test that the user can input a format but it will not prevail over summary forma
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 77836ee1113..a7355277bf4 100644
--- a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 a0154a45251..e431fc0cbfa 100644
--- a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 b9afb60a90a..5139088b767 100644
--- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 c5700a43985..92e1a3713e3 100644
--- a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 1fe3a600f93..11430ea74c7 100644
--- a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
+++ b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 ef9417282ab..335cef3590e 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 @@ Test lldb data formatter subsystem.
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 ebb34744ae1..a7a18220351 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 @@ Test that ValueObjectPrinter does not cause an infinite loop when a reference to
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 08aaea41725..3e139c1b414 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 @@ Test lldb data formatter subsystem.
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 f60fd4bd1d4..9d752f0b375 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -4,7 +4,7 @@ Check for an issue where capping does not work because the Target pointer appear
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 794fd76bb9c..1add38c1767 100644
--- a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
+++ b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 c79cec39233..13ea4d52335 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 @@ Test that the user can input a format but it will not prevail over summary forma
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 cb3927b6b51..9af60fc17d7 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 @@ Test lldb data formatter subsystem.
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 c4ce58d6f35..bbd246a599c 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 @@ Test lldb data formatter subsystem.
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 b69fe2e450c..5399b37126b 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 @@ Check that vector types format properly
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 61e181c4ea4..8234974903a 100644
--- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py
@@ -4,7 +4,7 @@ Test that breakpoint works correctly in the presence of dead-code stripping.
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 006832d8e87..adf1b14dc51 100644
--- a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
+++ b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
@@ -4,7 +4,7 @@ Test some lldb command abbreviations.
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 df8630655f9..a0f9f4d6b47 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 @@ Test that dynamic values update their child count correctly
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 542748e1b5c..0d6b39bdc51 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 f7a519124a9..658f1983658 100644
--- a/lldb/test/functionalities/exec/TestExec.py
+++ b/lldb/test/functionalities/exec/TestExec.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
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 377c7e753f3..e3b8e4aa046 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
@@ -4,7 +4,7 @@ Test that expr will time out and allow other threads to run if it blocks.
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 40b8f257709..ca721800b4d 100644
--- a/lldb/test/functionalities/fat_archives/TestFatArchives.py
+++ b/lldb/test/functionalities/fat_archives/TestFatArchives.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
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 d4123efb36e..b2e8487aa69 100644
--- a/lldb/test/functionalities/format/TestFormats.py
+++ b/lldb/test/functionalities/format/TestFormats.py
@@ -4,7 +4,7 @@ Test the command history mechanism
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 ccf4d61f222..7bbeff6c95a 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 4cc630c4a67..daf39e6477d 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 896221f00dd..9fe146fe71d 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 00ed361f21d..310b3d72074 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 7b2c38dca13..70d92dcca6e 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 8ed08fc4c86..2b25394afd3 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 90e40ce8a63..86e617f1995 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
@@ -3,7 +3,7 @@ Test that argdumper is a viable launching strategy.
"""
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 7f67fb539fc..29f6effeeff 100644
--- a/lldb/test/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py
@@ -4,7 +4,7 @@ Test that breakpoint by symbol name works correctly with dynamic libs.
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 b7294ed042c..b392f7a1c7e 100644
--- a/lldb/test/functionalities/longjmp/TestLongjmp.py
+++ b/lldb/test/functionalities/longjmp/TestLongjmp.py
@@ -4,7 +4,7 @@ Test the use of setjmp/longjmp for non-local goto operations in a single-threade
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 9fbb56fc6e2..085c9bdd989 100644
--- a/lldb/test/functionalities/memory/read/TestMemoryRead.py
+++ b/lldb/test/functionalities/memory/read/TestMemoryRead.py
@@ -4,7 +4,7 @@ Test the 'memory read' command.
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 3e1f21cdd34..9ff01abd974 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 out of scope to in scope when stopped at the breakpoint."""
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 9e5bd719acf..f1ca5d54ae1 100644
--- a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
+++ b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
@@ -3,7 +3,7 @@ Test that using a non-existent architecture name does not crash LLDB.
"""
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 ea851c7c8cd..56489529d2e 100644
--- a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
@@ -6,7 +6,7 @@ foreign-architecture object files.
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 3376fabe0fd..d001834b022 100644
--- a/lldb/test/functionalities/paths/TestPaths.py
+++ b/lldb/test/functionalities/paths/TestPaths.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
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 c049356d630..6333fdcffc2 100644
--- a/lldb/test/functionalities/platform/TestPlatformCommand.py
+++ b/lldb/test/functionalities/platform/TestPlatformCommand.py
@@ -4,7 +4,7 @@ Test some lldb platform commands.
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 79654e0d56d..e5a9581c881 100644
--- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -4,7 +4,7 @@ Test that plugins that load commands work correctly.
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 a1d61766ee5..d7ccfa3e6f5 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 @@ Test that the Python operating system plugin works correctly
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 379b27b4ce0..46dbb1d59df 100644
--- a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
+++ b/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
@@ -4,7 +4,7 @@ Test basics of mini dump debugging.
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 023da1373ba..d08dda21c27 100644
--- a/lldb/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py
@@ -4,7 +4,7 @@ Test process attach.
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 bc0b850ea36..e600b53de9c 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 @@ Test denied process attach.
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 c31d8173fe4..8779e5e84da 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 75b3a2584a3..41aee665b87 100644
--- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py
+++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
@@ -4,7 +4,7 @@ Test lldb process launch flags.
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 8774ff7bd9f..9d33da66180 100644
--- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
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 b77ade7b08c..5c07c5eb741 100755
--- a/lldb/test/functionalities/register/TestRegisters.py
+++ b/lldb/test/functionalities/register/TestRegisters.py
@@ -4,7 +4,7 @@ Test the 'register' command.
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 63b92c9752e..0058e24a2be 100644
--- a/lldb/test/functionalities/rerun/TestRerun.py
+++ b/lldb/test/functionalities/rerun/TestRerun.py
@@ -3,7 +3,7 @@ Test that argdumper is a viable launching strategy.
"""
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 bf895739c7a..88285b762dc 100644
--- a/lldb/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/test/functionalities/return-value/TestReturnValue.py
@@ -4,7 +4,7 @@ Test getting return-values correctly when stepping out
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 c8b388f5b72..720dae003e4 100644
--- a/lldb/test/functionalities/set-data/TestSetData.py
+++ b/lldb/test/functionalities/set-data/TestSetData.py
@@ -4,7 +4,7 @@ Set the contents of variables and registers using raw data
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 0e3c10b21a5..7ae62bc2014 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 b9380034d18..c60656a3c60 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 8a976b6c4b0..fe9077c0626 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 111940ea857..b79645f7908 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 @@ Test the lldb command line takes a filename with single quote chars.
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 94ffaec9852..9087df6afec 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 @@ Test thread step-in, step-over and step-out work with the "Avoid no debug" optio
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 916faee7253..37ad2c24d38 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -4,7 +4,7 @@ Test lldb target stop-hook command.
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 cba672e0811..89b9121643a 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
@@ -4,7 +4,7 @@ Test lldb target stop-hook mechanism to see whether it fires off correctly .
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 a929ac6d110..f38f7a598fc 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 @@ Test that lldb stop-hook works for multiple threads.
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 bf1d1855c69..7ffc64c3667 100644
--- a/lldb/test/functionalities/target_command/TestTargetCommand.py
+++ b/lldb/test/functionalities/target_command/TestTargetCommand.py
@@ -4,7 +4,7 @@ Test some target commands: create, list, select, variable.
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 4ba3ed50d82..28d51813644 100644
--- a/lldb/test/functionalities/thread/TestNumThreads.py
+++ b/lldb/test/functionalities/thread/TestNumThreads.py
@@ -4,7 +4,7 @@ Test number of threads.
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 3ea2b5c6907..cf12693c7b5 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 @@ Test number of threads.
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 af86dbf3378..80ebb7c6e13 100644
--- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
@@ -12,7 +12,7 @@ verified to match the expected number of events.
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 81b3beb4783..e2fce436473 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 @@ Test that step-inst over a crash behaves correctly.
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 344483ba603..6e363a3ffe6 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 @@ Test thread creation after process attach.
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 cee27354e10..0267f2e4776 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 @@ Test number of threads.
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 760b950651f..261c524c9de 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 @@ Test number of threads.
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 1f764af68e7..d5e83dc4be3 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 @@ Test number of threads.
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 4a55aff1714..1c0b32dc6d9 100644
--- a/lldb/test/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/test/functionalities/thread/jump/TestThreadJump.py
@@ -4,7 +4,7 @@ Test jumping to different places.
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 59fa0817368..fc81fa98c73 100644
--- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
+++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
@@ -4,7 +4,7 @@ Test number of threads.
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 0a434bf26c3..dc20507ad87 100644
--- a/lldb/test/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/test/functionalities/thread/state/TestThreadStates.py
@@ -4,7 +4,7 @@ Test thread states.
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 aa5d09e44c1..7ef1460d2f5 100644
--- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
@@ -4,7 +4,7 @@ Test stepping out from a function in a multi-threaded program.
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 facf1aa0d3d..89f65f9b505 100644
--- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
+++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
@@ -4,7 +4,7 @@ Test number of threads.
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 3b6407fa82d..29d3c489b2b 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 @@ Test that we obey thread conditioned breakpoints.
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 b0e47bbfa7b..6cfc4246273 100644
--- a/lldb/test/functionalities/tty/TestTerminal.py
+++ b/lldb/test/functionalities/tty/TestTerminal.py
@@ -4,7 +4,7 @@ Test lldb command aliases.
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 ea1c0119dd9..9c2b33ffbb7 100644
--- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py
+++ b/lldb/test/functionalities/type_completion/TestTypeCompletion.py
@@ -4,7 +4,7 @@ Check that types only get completed when necessary.
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 26e56c9b901..e50b323394e 100644
--- a/lldb/test/functionalities/type_lookup/TestTypeLookup.py
+++ b/lldb/test/functionalities/type_lookup/TestTypeLookup.py
@@ -4,7 +4,7 @@ Test type lookup command.
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 7b0fa135012..0a85c59b9f4 100644
--- a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
@@ -4,7 +4,7 @@ Test that we can backtrace correctly with 'noreturn' functions on the stack
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 a4d25fa1223..6f8412c93d6 100644
--- a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
@@ -4,7 +4,7 @@ Test that we can backtrace correctly with 'sigtramp' functions on the stack
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 bba6a71a3e9..7b7cf41c577 100644
--- a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
+++ b/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
@@ -12,7 +12,7 @@ after escaping some special characters).
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 01914a35161..98733e5379a 100644
--- a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
+++ b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
@@ -4,7 +4,7 @@ Verify that the hash computing logic for ValueObject's values can't crash us.
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 da487572754..8b9da4eae1f 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
@@ -4,7 +4,7 @@ Test lldb watchpoint that uses '-s size' to watch a pointed location with size.
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 cfdcd727d2c..87c2e20c499 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -4,7 +4,7 @@ Test my first lldb watchpoint.
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 48e5e98aca7..b615fc77e21 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
@@ -4,7 +4,7 @@ Test that lldb watchpoint works for multiple threads.
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 d64924e1981..a9d706f105b 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 681d420fec8..0c781bf73ef 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 @@ Test that a variable watchpoint should only hit when in scope.
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 24808f3214c..43ddf847f2b 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
@@ -4,7 +4,7 @@ Test watchpoint list, enable, disable, and delete commands.
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 f89f76b0c0b..fc359efa729 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 @@ Test 'watchpoint command'.
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 1960c76df9b..d6af0c2f229 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 @@ Test 'watchpoint command'.
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 919a8a44687..eddef4c1446 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 @@ Test watchpoint modify command to set condition on a watchpoint.
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 0b325509491..c19ee8f99ac 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 a594bbda8c8..d6e5826c130 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 @@ Test displayed value of a vector variable while doing watchpoint operations
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 7763e78f39a..3ad93702661 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 @@ Test lldb watchpoint that uses 'watchpoint set -w write -s size' to watch a poin
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 b6f80910287..aac278b1cf0 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 @@ Test error cases for the 'watchpoint set' command to make sure it errors out whe
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
OpenPOWER on IntegriCloud