summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-10-27 20:12:05 +0000
committerZachary Turner <zturner@google.com>2015-10-27 20:12:05 +0000
commit0a0490b1520e96b728448b8c43ca873fcaa809dc (patch)
treed86351542362fcd3187d40fdfb0ccb939ac2f99a
parent235acde953856a52b692cecf2c0484f2c30fdf43 (diff)
downloadllvm-0a0490b1520e96b728448b8c43ca873fcaa809dc.tar.gz
Rename `lldb_shared` to `use_lldb_suite`.
llvm-svn: 251444
-rw-r--r--lldb/test/android/platform/TestDefaultCacheLineSize.py2
-rw-r--r--lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py2
-rw-r--r--lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py2
-rw-r--r--lldb/test/api/multithreaded/TestMultithreaded.py2
-rw-r--r--lldb/test/arm_emulation/TestEmulations.py2
-rw-r--r--lldb/test/benchmarks/continue/TestBenchmarkContinue.py2
-rw-r--r--lldb/test/benchmarks/disassembly/TestDisassembly.py2
-rw-r--r--lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py2
-rw-r--r--lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py2
-rw-r--r--lldb/test/benchmarks/expression/TestExpressionCmd.py2
-rw-r--r--lldb/test/benchmarks/expression/TestRepeatedExprs.py2
-rw-r--r--lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py2
-rw-r--r--lldb/test/benchmarks/startup/TestStartupDelays.py2
-rw-r--r--lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py2
-rw-r--r--lldb/test/benchmarks/stepping/TestSteppingSpeed.py2
-rw-r--r--lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py2
-rwxr-xr-xlldb/test/dosep.py2
-rwxr-xr-xlldb/test/dotest.py2
-rw-r--r--lldb/test/dotest_channels.py2
-rw-r--r--lldb/test/driver/batch_mode/TestBatchMode.py2
-rw-r--r--lldb/test/expression_command/call-function/TestCallStdStringFunction.py2
-rw-r--r--lldb/test/expression_command/call-function/TestCallStopAndContinue.py2
-rw-r--r--lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py2
-rw-r--r--lldb/test/expression_command/call-restarts/TestCallThatRestarts.py2
-rw-r--r--lldb/test/expression_command/call-throws/TestCallThatThrows.py2
-rw-r--r--lldb/test/expression_command/char/TestExprsChar.py2
-rw-r--r--lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py2
-rw-r--r--lldb/test/expression_command/formatters/TestFormatters.py2
-rw-r--r--lldb/test/expression_command/issue_11588/Test11588.py2
-rw-r--r--lldb/test/expression_command/options/TestExprOptions.py2
-rw-r--r--lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py2
-rw-r--r--lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py2
-rw-r--r--lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py2
-rw-r--r--lldb/test/expression_command/persistent_types/TestPersistentTypes.py2
-rw-r--r--lldb/test/expression_command/persistent_variables/TestPersistentVariables.py2
-rw-r--r--lldb/test/expression_command/po_verbosity/TestPoVerbosity.py2
-rw-r--r--lldb/test/expression_command/radar_8638051/Test8638051.py2
-rw-r--r--lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py2
-rw-r--r--lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py2
-rw-r--r--lldb/test/expression_command/test/TestExprs.py2
-rw-r--r--lldb/test/expression_command/test/TestExprs2.py2
-rw-r--r--lldb/test/expression_command/timeout/TestCallWithTimeout.py2
-rw-r--r--lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py2
-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
-rw-r--r--lldb/test/help/TestHelp.py2
-rw-r--r--lldb/test/lang/c/anonymous/TestAnonymous.py2
-rw-r--r--lldb/test/lang/c/array_types/TestArrayTypes.py2
-rw-r--r--lldb/test/lang/c/bitfields/TestBitfields.py2
-rw-r--r--lldb/test/lang/c/blocks/TestBlocks.py2
-rw-r--r--lldb/test/lang/c/const_variables/TestConstVariables.py2
-rw-r--r--lldb/test/lang/c/enum_types/TestEnumTypes.py2
-rw-r--r--lldb/test/lang/c/forward/TestForwardDeclaration.py2
-rw-r--r--lldb/test/lang/c/function_types/TestFunctionTypes.py2
-rw-r--r--lldb/test/lang/c/global_variables/TestGlobalVariables.py2
-rw-r--r--lldb/test/lang/c/modules/TestCModules.py2
-rw-r--r--lldb/test/lang/c/register_variables/TestRegisterVariables.py2
-rw-r--r--lldb/test/lang/c/set_values/TestSetValues.py2
-rw-r--r--lldb/test/lang/c/shared_lib/TestSharedLib.py2
-rw-r--r--lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py2
-rw-r--r--lldb/test/lang/c/stepping/TestStepAndBreakpoints.py2
-rw-r--r--lldb/test/lang/c/stepping/TestThreadStepping.py2
-rw-r--r--lldb/test/lang/c/tls_globals/TestTlsGlobals.py2
-rw-r--r--lldb/test/lang/c/typedef/Testtypedef.py2
-rw-r--r--lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py2
-rw-r--r--lldb/test/lang/cpp/char1632_t/TestChar1632T.py2
-rw-r--r--lldb/test/lang/cpp/class_static/TestStaticVariables.py2
-rw-r--r--lldb/test/lang/cpp/class_types/TestClassTypes.py2
-rw-r--r--lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py2
-rw-r--r--lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py2
-rw-r--r--lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py2
-rw-r--r--lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py2
-rw-r--r--lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py2
-rw-r--r--lldb/test/lang/cpp/namespace/TestNamespace.py2
-rw-r--r--lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py2
-rw-r--r--lldb/test/lang/cpp/signed_types/TestSignedTypes.py2
-rw-r--r--lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py2
-rw-r--r--lldb/test/lang/cpp/stl/TestSTL.py2
-rw-r--r--lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py2
-rw-r--r--lldb/test/lang/cpp/unique-types/TestUniqueTypes.py2
-rw-r--r--lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py2
-rw-r--r--lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py2
-rw-r--r--lldb/test/lang/go/goroutines/TestGoroutines.py2
-rw-r--r--lldb/test/lang/go/types/TestGoASTContext.py2
-rw-r--r--lldb/test/lang/mixed/TestMixedLanguages.py2
-rw-r--r--lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py2
-rw-r--r--lldb/test/lang/objc/forward-decl/TestForwardDecl.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestConstStrings.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestFoundationDisassembly.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestObjCMethods.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestObjCMethods2.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestRuntimeTypes.py2
-rw-r--r--lldb/test/lang/objc/foundation/TestSymbolTable.py2
-rw-r--r--lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py2
-rw-r--r--lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py2
-rw-r--r--lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py2
-rw-r--r--lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py2
-rw-r--r--lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py2
-rw-r--r--lldb/test/lang/objc/modules/TestObjCModules.py2
-rw-r--r--lldb/test/lang/objc/objc++/TestObjCXX.py2
-rw-r--r--lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py2
-rw-r--r--lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py2
-rw-r--r--lldb/test/lang/objc/objc-checker/TestObjCCheckers.py2
-rw-r--r--lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py2
-rw-r--r--lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py2
-rw-r--r--lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py2
-rw-r--r--lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py2
-rw-r--r--lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py2
-rw-r--r--lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py2
-rw-r--r--lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py2
-rw-r--r--lldb/test/lang/objc/objc-property/TestObjCProperty.py2
-rw-r--r--lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py2
-rw-r--r--lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py2
-rw-r--r--lldb/test/lang/objc/objc-stepping/TestObjCStepping.py2
-rw-r--r--lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py2
-rw-r--r--lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py2
-rw-r--r--lldb/test/lang/objc/objc-super/TestObjCSuper.py2
-rw-r--r--lldb/test/lang/objc/print-obj/TestPrintObj.py2
-rw-r--r--lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py2
-rw-r--r--lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py2
-rw-r--r--lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py2
-rw-r--r--lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py2
-rw-r--r--lldb/test/lang/objc/real-definition/TestRealDefinition.py2
-rw-r--r--lldb/test/linux/builtin_trap/TestBuiltinTrap.py2
-rw-r--r--lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py2
-rw-r--r--lldb/test/lldbcurses.py2
-rw-r--r--lldb/test/lldbpexpect.py2
-rw-r--r--lldb/test/lldbtest.py2
-rw-r--r--lldb/test/lldbutil.py2
-rw-r--r--lldb/test/logging/TestLogging.py2
-rw-r--r--lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py2
-rw-r--r--lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py2
-rw-r--r--lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py2
-rw-r--r--lldb/test/macosx/order/TestOrderFile.py2
-rw-r--r--lldb/test/macosx/queues/TestQueues.py2
-rw-r--r--lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py2
-rw-r--r--lldb/test/macosx/universal/TestUniversal.py2
-rwxr-xr-xlldb/test/progress.py2
-rw-r--r--lldb/test/python_api/breakpoint/TestBreakpointAPI.py2
-rw-r--r--lldb/test/python_api/class_members/TestSBTypeClassMembers.py2
-rw-r--r--lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py2
-rw-r--r--lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py2
-rw-r--r--lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py2
-rw-r--r--lldb/test/python_api/event/TestEvents.py2
-rw-r--r--lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py2
-rw-r--r--lldb/test/python_api/formatters/TestFormattersSBAPI.py2
-rw-r--r--lldb/test/python_api/frame/TestFrames.py2
-rw-r--r--lldb/test/python_api/frame/inlines/TestInlinedFrame.py2
-rw-r--r--lldb/test/python_api/function_symbol/TestDisasmAPI.py2
-rw-r--r--lldb/test/python_api/function_symbol/TestSymbolAPI.py2
-rw-r--r--lldb/test/python_api/hello_world/TestHelloWorld.py2
-rw-r--r--lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py2
-rw-r--r--lldb/test/python_api/lldbutil/frame/TestFrameUtils.py2
-rw-r--r--lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py2
-rw-r--r--lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py2
-rw-r--r--lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py2
-rw-r--r--lldb/test/python_api/module_section/TestModuleAndSection.py2
-rw-r--r--lldb/test/python_api/objc_type/TestObjCType.py2
-rw-r--r--lldb/test/python_api/process/TestProcessAPI.py2
-rw-r--r--lldb/test/python_api/process/io/TestProcessIO.py2
-rw-r--r--lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py2
-rw-r--r--lldb/test/python_api/sbdata/TestSBData.py2
-rw-r--r--lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py2
-rwxr-xr-xlldb/test/python_api/section/TestSectionAPI.py2
-rw-r--r--lldb/test/python_api/signals/TestSignalsAPI.py2
-rw-r--r--lldb/test/python_api/symbol-context/TestSymbolContext.py2
-rw-r--r--lldb/test/python_api/target/TestTargetAPI.py2
-rw-r--r--lldb/test/python_api/thread/TestThreadAPI.py2
-rw-r--r--lldb/test/python_api/type/TestTypeList.py2
-rw-r--r--lldb/test/python_api/value/TestValueAPI.py2
-rw-r--r--lldb/test/python_api/value/change_values/TestChangeValueAPI.py2
-rw-r--r--lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py2
-rw-r--r--lldb/test/python_api/value_var_update/TestValueVarUpdate.py2
-rw-r--r--lldb/test/python_api/watchpoint/TestSetWatchpoint.py2
-rw-r--r--lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py2
-rw-r--r--lldb/test/python_api/watchpoint/TestWatchpointIter.py2
-rw-r--r--lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py2
-rw-r--r--lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py2
-rw-r--r--lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py2
-rw-r--r--lldb/test/settings/TestSettings.py2
-rw-r--r--lldb/test/settings/quoting/TestQuoting.py2
-rw-r--r--lldb/test/source-manager/TestSourceManager.py2
-rw-r--r--lldb/test/terminal/TestSTTYBeforeAndAfter.py2
-rw-r--r--lldb/test/test_results.py2
-rw-r--r--lldb/test/tools/lldb-mi/TestMiExit.py2
-rw-r--r--lldb/test/tools/lldb-mi/TestMiFile.py2
-rw-r--r--lldb/test/tools/lldb-mi/TestMiGdbSetShow.py2
-rw-r--r--lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py2
-rw-r--r--lldb/test/tools/lldb-mi/TestMiPrompt.py2
-rw-r--r--lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py2
-rw-r--r--lldb/test/tools/lldb-mi/control/TestMiExec.py2
-rw-r--r--lldb/test/tools/lldb-mi/data/TestMiData.py2
-rw-r--r--lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py2
-rw-r--r--lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py2
-rw-r--r--lldb/test/tools/lldb-mi/lldbmi_testcase.py2
-rw-r--r--lldb/test/tools/lldb-mi/signal/TestMiSignal.py2
-rw-r--r--lldb/test/tools/lldb-mi/stack/TestMiStack.py2
-rw-r--r--lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py2
-rw-r--r--lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py2
-rw-r--r--lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py2
-rw-r--r--lldb/test/tools/lldb-mi/target/TestMiTarget.py2
-rw-r--r--lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py2
-rw-r--r--lldb/test/tools/lldb-mi/variable/TestMiVar.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteAttach.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteKill.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py2
-rw-r--r--lldb/test/tools/lldb-server/TestGdbRemote_vCont.py2
-rw-r--r--lldb/test/tools/lldb-server/TestLldbGdbServer.py2
-rw-r--r--lldb/test/tools/lldb-server/commandline/TestStubSetSID.py2
-rw-r--r--lldb/test/tools/lldb-server/gdbremote_testcase.py2
-rw-r--r--lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py2
-rw-r--r--lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py2
-rw-r--r--lldb/test/tools/lldb-server/lldbgdbserverutils.py2
-rw-r--r--lldb/test/tools/lldb-server/socket_packet_pump.py2
-rw-r--r--lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py2
-rw-r--r--lldb/test/types/HideTestFailures.py2
-rw-r--r--lldb/test/types/TestFloatTypes.py2
-rw-r--r--lldb/test/types/TestFloatTypesExpr.py2
-rw-r--r--lldb/test/types/TestIntegerTypes.py2
-rw-r--r--lldb/test/types/TestIntegerTypesExpr.py2
-rw-r--r--lldb/test/types/TestRecursiveTypes.py2
-rw-r--r--lldb/test/use_lldb_suite.py (renamed from lldb/test/lldb_shared.py)4
-rw-r--r--lldb/test/warnings/uuid/TestAddDsymCommand.py2
-rw-r--r--lldb/third_party/Python/module/unittest2/unittest2/result.py2
-rw-r--r--lldb/use_lldb_suite_root.py (renamed from lldb/lldb_shared_base.py)0
395 files changed, 395 insertions, 395 deletions
diff --git a/lldb/test/android/platform/TestDefaultCacheLineSize.py b/lldb/test/android/platform/TestDefaultCacheLineSize.py
index d559dab06d67..221ff489f6de 100644
--- a/lldb/test/android/platform/TestDefaultCacheLineSize.py
+++ b/lldb/test/android/platform/TestDefaultCacheLineSize.py
@@ -4,7 +4,7 @@ Verify the default cache line size for android targets
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
index 206e3ec821f4..dc844e3c0ffd 100644
--- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -5,7 +5,7 @@ should compile and link with the LLDB framework."""
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
index b4d97bd53de3..dff26f3688e7 100644
--- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/api/multithreaded/TestMultithreaded.py b/lldb/test/api/multithreaded/TestMultithreaded.py
index 6be4bc14aa2c..7edaf1a96234 100644
--- a/lldb/test/api/multithreaded/TestMultithreaded.py
+++ b/lldb/test/api/multithreaded/TestMultithreaded.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, re
from lldbtest import *
diff --git a/lldb/test/arm_emulation/TestEmulations.py b/lldb/test/arm_emulation/TestEmulations.py
index f4427cf216e1..9ac1060f2603 100644
--- a/lldb/test/arm_emulation/TestEmulations.py
+++ b/lldb/test/arm_emulation/TestEmulations.py
@@ -4,7 +4,7 @@ Test some ARM instruction emulation.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
index 8599124eae05..a03eb4239ac7 100644
--- a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/test/benchmarks/continue/TestBenchmarkContinue.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/benchmarks/disassembly/TestDisassembly.py b/lldb/test/benchmarks/disassembly/TestDisassembly.py
index 522be3a3cd9a..69d645a52e06 100644
--- a/lldb/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index c8a28b86f797..1e1c1d48fd95 100644
--- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
@@ -4,7 +4,7 @@ inferior and traverses the stack for thread0 to arrive at frame with function
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 913f9c00019c..4db2d08199b6 100644
--- a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/expression/TestExpressionCmd.py b/lldb/test/benchmarks/expression/TestExpressionCmd.py
index b6c9d912cf8c..9540c0ce68d2 100644
--- a/lldb/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/test/benchmarks/expression/TestExpressionCmd.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
index f2c26b1cfd67..78111051e2d7 100644
--- a/lldb/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index 67d48f014bfb..baad1c4464a1 100644
--- a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/startup/TestStartupDelays.py b/lldb/test/benchmarks/startup/TestStartupDelays.py
index 217e98db23e8..f95225ba92f8 100644
--- a/lldb/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/test/benchmarks/startup/TestStartupDelays.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index 3fbc787f4620..cb85dd19948d 100644
--- a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
index 3fa01aeaef4c..c1b6e716414a 100644
--- a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index a1342bdbbc78..0c3d34f15071 100644
--- a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys
import lldb
diff --git a/lldb/test/dosep.py b/lldb/test/dosep.py
index 41240654ac1e..716adbc3c288 100755
--- a/lldb/test/dosep.py
+++ b/lldb/test/dosep.py
@@ -34,7 +34,7 @@ echo core.%p | sudo tee /proc/sys/kernel/core_pattern
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
# system packages and modules
import asyncore
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index fde7a4fede0c..7524ee433c81 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -22,7 +22,7 @@ for available options.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import atexit
import commands
diff --git a/lldb/test/dotest_channels.py b/lldb/test/dotest_channels.py
index 111e628e0eda..e1922876b490 100644
--- a/lldb/test/dotest_channels.py
+++ b/lldb/test/dotest_channels.py
@@ -16,7 +16,7 @@ framework.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import asyncore
import socket
diff --git a/lldb/test/driver/batch_mode/TestBatchMode.py b/lldb/test/driver/batch_mode/TestBatchMode.py
index f88591aa4b3a..640f6120b269 100644
--- a/lldb/test/driver/batch_mode/TestBatchMode.py
+++ b/lldb/test/driver/batch_mode/TestBatchMode.py
@@ -4,7 +4,7 @@ Test that the lldb driver's batch mode works correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
index ef04bdb59d65..11caf6277445 100644
--- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -4,7 +4,7 @@ Test calling std::String member functions.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
index cc66dd0c6ea5..1cd2d83373f7 100644
--- a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
+++ b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
@@ -4,7 +4,7 @@ Test calling a function, stopping in the call, continue and gather the result on
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
index f851779c58df..3b101285750c 100644
--- a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
@@ -9,7 +9,7 @@ Note:
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
index e3d368c97cd3..38f0ab73db45 100644
--- a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
+++ b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
@@ -4,7 +4,7 @@ Test calling a function that hits a signal set to auto-restart, make sure the ca
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/test/expression_command/call-throws/TestCallThatThrows.py
index 85774cdc65f0..874c9f7da07e 100644
--- a/lldb/test/expression_command/call-throws/TestCallThatThrows.py
+++ b/lldb/test/expression_command/call-throws/TestCallThatThrows.py
@@ -4,7 +4,7 @@ Test calling a function that throws an ObjC exception, make sure that it doesn't
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/char/TestExprsChar.py b/lldb/test/expression_command/char/TestExprsChar.py
index 0e6478ac238e..cb57fdb1b7b1 100644
--- a/lldb/test/expression_command/char/TestExprsChar.py
+++ b/lldb/test/expression_command/char/TestExprsChar.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
index 83c98affdd02..f115f13f773c 100644
--- a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/expression_command/formatters/TestFormatters.py b/lldb/test/expression_command/formatters/TestFormatters.py
index c8bb2847a48d..6fb6cd8bcd73 100644
--- a/lldb/test/expression_command/formatters/TestFormatters.py
+++ b/lldb/test/expression_command/formatters/TestFormatters.py
@@ -4,7 +4,7 @@ Test using LLDB data formatters with frozen objects coming from the expression p
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/issue_11588/Test11588.py b/lldb/test/expression_command/issue_11588/Test11588.py
index 53b7fc94fafb..5941cb50946f 100644
--- a/lldb/test/expression_command/issue_11588/Test11588.py
+++ b/lldb/test/expression_command/issue_11588/Test11588.py
@@ -6,7 +6,7 @@ expected in a SyntheticChildrenProvider
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/options/TestExprOptions.py b/lldb/test/expression_command/options/TestExprOptions.py
index 846f676eb641..2c0eb6551eac 100644
--- a/lldb/test/expression_command/options/TestExprOptions.py
+++ b/lldb/test/expression_command/options/TestExprOptions.py
@@ -9,7 +9,7 @@ o test_expr_options:
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index b11ea8a6ced1..e959450a5c7d 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -4,7 +4,7 @@ Test that we can p *objcObject
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
index 4c10e2a946b9..8d3e31d16327 100644
--- a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -4,7 +4,7 @@ Test that we can have persistent pointer variables
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
index 7e474c889efa..fdc8b68bddd2 100644
--- a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
@@ -4,7 +4,7 @@ Test that nested persistent types work.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
index 3ed03843184a..48ee99fe7800 100644
--- a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
+++ b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
@@ -4,7 +4,7 @@ Test that lldb persistent types works correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
index c6f270f7b627..6790014f5e63 100644
--- a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
@@ -4,7 +4,7 @@ Test that lldb persistent variables works correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
index 9603bb536cb8..b50cc2625869 100644
--- a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
+++ b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
@@ -4,7 +4,7 @@ Test that the po command acts correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/radar_8638051/Test8638051.py b/lldb/test/expression_command/radar_8638051/Test8638051.py
index a8ba0216bb60..3b61a4688482 100644
--- a/lldb/test/expression_command/radar_8638051/Test8638051.py
+++ b/lldb/test/expression_command/radar_8638051/Test8638051.py
@@ -4,7 +4,7 @@ Test the robustness of lldb expression parser.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
index 41e3cf8299f3..e7821a68f29f 100644
--- a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
@@ -4,7 +4,7 @@ The evaluating printf(...) after break stop and then up a stack frame.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
index 8538bb3da5d8..7d7c8ed046c3 100644
--- a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
@@ -4,7 +4,7 @@ Test example snippets from the lldb 'help expression' output.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/expression_command/test/TestExprs.py b/lldb/test/expression_command/test/TestExprs.py
index 7b6d032aba5e..70d36896dcd1 100644
--- a/lldb/test/expression_command/test/TestExprs.py
+++ b/lldb/test/expression_command/test/TestExprs.py
@@ -13,7 +13,7 @@ o test_expr_commands_can_handle_quotes:
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
diff --git a/lldb/test/expression_command/test/TestExprs2.py b/lldb/test/expression_command/test/TestExprs2.py
index b835c086ab89..672521dd1d19 100644
--- a/lldb/test/expression_command/test/TestExprs2.py
+++ b/lldb/test/expression_command/test/TestExprs2.py
@@ -4,7 +4,7 @@ Test some more expression commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
index 59a1be6f7e7c..6e3e88790739 100644
--- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
@@ -4,7 +4,7 @@ Test calling a function that waits a while, and make sure the timeout option to
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index 6edf8be453f5..7e67b334e4de 100644
--- a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
@@ -6,7 +6,7 @@ The expression parser's type search only looks in the current compilation unit f
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
index 3a089a23c2e7..469d9a5c789c 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 833229e06b04..ba8a0a66013a 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 a2071d3bad48..b51c3ebe5104 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 a0d853345ccc..088a3a3262b4 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 462fc0151797..8bc931df6e04 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 093fbd92c2bb..fa8c093d1c16 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 27ec6829aaf2..0f1014a81825 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 18c03f9725c0..1b10e3a250dc 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 320a6113b5c3..256f790de570 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 f16588b16d2f..83997617f0e7 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 afc9f91eb306..57b0f0f405ea 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 95114ba4300d..a60d559965e2 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 3fe89f328134..346a35c78356 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 77b51ed72261..9000f8f47a9d 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 3f9a630945ea..c57dae18471b 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 3e03a40e46b8..a808e5f4fdd1 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 c290bcb785b8..850d12fa732b 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 e4ef5154a486..beebc0b1301f 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 febd6190d862..87fc4488c361 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 fa618b8e4979..ede32f58ed1e 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 65e7f1d50e49..1a7348909746 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 73014c026acf..4358eeb02b6d 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 5cb91239925a..fd09794b4744 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 bb7d78fb4ac0..e8a7ccdfa00e 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 128473a36bd5..98dfc9765b58 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 ba47ed8d959e..f6875a4b4cab 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 37d5fbd2be0c..3a317d358dfc 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 f314adebefbc..9f8aa1dc3268 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 cd18e4cfc957..8d8d7f1c53f4 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 936201157ac4..e74686ed6190 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 31862ac9bf54..c9aee18cad1c 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 097c9f572f7d..980d353d26c3 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 61de7cae798b..09674dd35164 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 0d97a4072139..ebd781828354 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 64c09e1fdbc3..95b66e43700e 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 0cf33efffb8a..a9fe04d480d6 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 791cc267a467..e8150610a3ea 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 441463636a15..ffdd8078b230 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 cb1163a405c5..4eff86f3860d 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 0e6a58a25a6d..fe5a23b27492 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 7310f8599d06..e96d2de51656 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 3ef22dad37dd..e0f711598af7 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 1a4a7f396710..e44dcb53eebf 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 0600861334c2..3300341825fd 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 957c8dbe057d..d666e476f75c 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 1347c43de687..1e6ef1c6360b 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 771e87c2f2b4..c2d1c1b25511 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 41d080d6b800..e27a2faabfb3 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 327a121a4ae1..24406ecf7631 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 2ced549edb53..fdc13f47e739 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 6626539504fa..25f02c837811 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 6ef514935432..7bd47c0e900d 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 226cfb94edbe..9a930b4c1d1f 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 65f0f5c12ea0..693910307502 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 5ea67b273e39..5522fe3fe26d 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 231ff85ab1c3..23c351420c75 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 c341ce027b3b..975c6fe6af17 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 2c1b90b69a26..d4646786c277 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 0cb33b92f678..929aa99b42d2 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 e307af7f63f5..306e389de26b 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 057a8f606d97..67b4cf951482 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 ac5518a6a01f..e6eb21c4b50d 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 ec31cd789c87..a3074073065b 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 65d09e01103e..8fa99c5b7628 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 0f1fde45148d..55d985c2c541 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 3a6145b11ba4..3436ff69a45b 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 0aba73faa8e9..8c7ba2b36a70 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 22128e16907b..644e477edd6f 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 694ebbe17f05..bd9e53348188 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 71296ecf459e..d006c9a95b7e 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 063fe382d9ee..b12e3b663369 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 5726b3fd0ee3..48a981b0edec 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 77836ee11132..a7355277bf4b 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 a0154a452515..e431fc0cbfa2 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 b9afb60a90a4..5139088b767c 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 c5700a439852..92e1a3713e33 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 1fe3a600f935..11430ea74c74 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 ef9417282ab8..335cef3590ea 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 ebb34744ae1e..a7a182203516 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 08aaea417252..3e139c1b4144 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 f60fd4bd1d46..9d752f0b375c 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 794fd76bb9c7..1add38c17672 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 c79cec39233c..13ea4d52335c 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 cb3927b6b517..9af60fc17d79 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 c4ce58d6f351..bbd246a599c3 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 b69fe2e450c1..5399b37126bd 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 61e181c4ea48..8234974903af 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 006832d8e87b..adf1b14dc512 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 df8630655f95..a0f9f4d6b475 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 542748e1b5c9..0d6b39bdc51a 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 f7a519124a91..658f19836589 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 377c7e753f33..e3b8e4aa0466 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 40b8f2577097..ca721800b4d8 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 d4123efb36e3..b2e8487aa694 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 ccf4d61f222d..7bbeff6c95a6 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 4cc630c4a676..daf39e6477d9 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 896221f00ddb..9fe146fe71d1 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 00ed361f21d9..310b3d720745 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 7b2c38dca13e..70d92dcca6e9 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 8ed08fc4c869..2b25394afd39 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 90e40ce8a63b..86e617f19953 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 7f67fb539fc5..29f6effeeff3 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 b7294ed042c2..b392f7a1c7e5 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 9fbb56fc6e2b..085c9bdd9890 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 3e1f21cdd34f..9ff01abd9747 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 9e5bd719acf8..f1ca5d54ae13 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 ea851c7c8cd6..56489529d2ef 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 3376fabe0fd6..d001834b0228 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 c049356d6307..6333fdcffc21 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 79654e0d56d4..e5a9581c8811 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 a1d61766ee58..d7ccfa3e6f55 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 379b27b4ce04..46dbb1d59df8 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 023da1373bac..d08dda21c276 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 bc0b850ea36f..e600b53de9c6 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 c31d8173fe4e..8779e5e84da4 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 75b3a2584a3c..41aee665b87f 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 8774ff7bd9f6..9d33da66180f 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 b77ade7b08c2..5c07c5eb7415 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 63b92c9752e7..0058e24a2beb 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 bf895739c7ae..88285b762dcc 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 c8b388f5b72c..720dae003e4d 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 0e3c10b21a54..7ae62bc20146 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 b9380034d186..c60656a3c60b 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 8a976b6c4b03..fe9077c0626f 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 111940ea857f..b79645f7908e 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 94ffaec9852a..9087df6afec6 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 916faee7253a..37ad2c24d38c 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 cba672e08118..89b9121643a7 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 a929ac6d110f..f38f7a598fca 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 bf1d1855c697..7ffc64c3667c 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 4ba3ed50d826..28d51813644f 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 3ea2b5c6907b..cf12693c7b5c 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 af86dbf33780..80ebb7c6e13f 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 81b3beb47835..e2fce4364730 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 344483ba6036..6e363a3ffe61 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 cee27354e106..0267f2e47761 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 760b950651f7..261c524c9deb 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 1f764af68e70..d5e83dc4be3b 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 4a55aff17143..1c0b32dc6d95 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 59fa08173683..fc81fa98c730 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 0a434bf26c3c..dc20507ad872 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 aa5d09e44c1e..7ef1460d2f5b 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 facf1aa0d3d5..89f65f9b505b 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 3b6407fa82db..29d3c489b2b5 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 b0e47bbfa7bb..6cfc4246273b 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 ea1c0119dd95..9c2b33ffbb70 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 26e56c9b9015..e50b323394e3 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 7b0fa135012e..0a85c59b9f4a 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 a4d25fa1223c..6f8412c93d61 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 bba6a71a3e99..7b7cf41c577a 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 01914a35161e..98733e5379a2 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 da487572754b..8b9da4eae1ff 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 cfdcd727d2c5..87c2e20c4996 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 48e5e98aca78..b615fc77e215 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 d64924e1981f..a9d706f105be 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 681d420fec81..0c781bf73efb 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 24808f3214c9..43ddf847f2bb 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 f89f76b0c0b5..fc359efa729d 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 1960c76df9b8..d6af0c2f229e 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 919a8a44687c..eddef4c1446f 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 0b3255094919..c19ee8f99ac2 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 a594bbda8c84..d6e5826c1301 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 7763e78f39ad..3ad937026618 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 b6f80910287b..aac278b1cf04 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
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index b25666c00300..90aa2c90b29a 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -6,7 +6,7 @@ See also CommandInterpreter::OutputFormattedHelpText().
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/lang/c/anonymous/TestAnonymous.py
index 3f79233248b7..539cb94caa58 100644
--- a/lldb/test/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/test/lang/c/anonymous/TestAnonymous.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py
index f87f70ab4ae2..ecfe0c269800 100644
--- a/lldb/test/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/test/lang/c/array_types/TestArrayTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py
index a459434fe283..b9ae8a51ae67 100644
--- a/lldb/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/test/lang/c/bitfields/TestBitfields.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/test/lang/c/blocks/TestBlocks.py
index 5ad48ec09d4a..fb32bf3e38d7 100644
--- a/lldb/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/test/lang/c/blocks/TestBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/lang/c/const_variables/TestConstVariables.py
index 2f3a7638ab45..a0471cc57041 100644
--- a/lldb/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/test/lang/c/const_variables/TestConstVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/enum_types/TestEnumTypes.py b/lldb/test/lang/c/enum_types/TestEnumTypes.py
index a8af9603800c..46355a978e69 100644
--- a/lldb/test/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/test/lang/c/enum_types/TestEnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py
index 430f20b05127..05868597eec9 100644
--- a/lldb/test/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py
index ab5d1bc51660..85a97d4a2980 100644
--- a/lldb/test/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/lang/c/global_variables/TestGlobalVariables.py
index 92f2526e9f06..b75ef4fa38d9 100644
--- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/test/lang/c/global_variables/TestGlobalVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/modules/TestCModules.py b/lldb/test/lang/c/modules/TestCModules.py
index c35a687a2bcf..0453aa837b65 100644
--- a/lldb/test/lang/c/modules/TestCModules.py
+++ b/lldb/test/lang/c/modules/TestCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/lang/c/register_variables/TestRegisterVariables.py
index 343dcc8704a8..b20309395a97 100644
--- a/lldb/test/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/test/lang/c/register_variables/TestRegisterVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py
index c5685174af52..276d9ef05ea9 100644
--- a/lldb/test/lang/c/set_values/TestSetValues.py
+++ b/lldb/test/lang/c/set_values/TestSetValues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/shared_lib/TestSharedLib.py b/lldb/test/lang/c/shared_lib/TestSharedLib.py
index 0d478064ea74..fedb1d622258 100644
--- a/lldb/test/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/test/lang/c/shared_lib/TestSharedLib.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index e4dac28cfd9b..549db3a407f6 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
index 0e0c624c4fe8..5048d014f609 100644
--- a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/c/stepping/TestThreadStepping.py b/lldb/test/lang/c/stepping/TestThreadStepping.py
index db8a726ff573..fcc8428d5d7c 100644
--- a/lldb/test/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/test/lang/c/stepping/TestThreadStepping.py
@@ -4,7 +4,7 @@ Test thread stepping features in combination with frame select.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
index 0959154f21a5..6236519a7840 100644
--- a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/c/typedef/Testtypedef.py b/lldb/test/lang/c/typedef/Testtypedef.py
index fc8a5a602392..f8f3393307a9 100644
--- a/lldb/test/lang/c/typedef/Testtypedef.py
+++ b/lldb/test/lang/c/typedef/Testtypedef.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 72c01ad344d8..3f788b7fd6fb 100644
--- a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
@@ -4,7 +4,7 @@ Test lldb breakpoint command for CPP methods & functions in a namespace.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
index 0e55babc91a9..b37c1bbdb717 100644
--- a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
@@ -5,7 +5,7 @@ Test that the C++11 support for char16_t and char32_t works correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
index 5bb54810f2ee..6d88585e4539 100644
--- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -4,7 +4,7 @@ Test display and Python APIs on file and class static variables.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py
index 3fda9e4faa51..822a257bce77 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index cbb345602547..5a56f9d0fd29 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -4,7 +4,7 @@ Test the lldb disassemble command on each call frame when stopped on C's ctor.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
index bcefda2caafa..5d5d471ccc7a 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -4,7 +4,7 @@ Test lldb Python API SBValue::Cast(SBType) for C++ types.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
index 4f1cd5e31c8d..ee40cb14173f 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
@@ -4,7 +4,7 @@ Use lldb Python API to test dynamic values in C++
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index a31519ffc194..ec19c1bf9201 100644
--- a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index babe4f2f98a8..452f98889c22 100644
--- a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
@@ -4,7 +4,7 @@ Test lldb exception breakpoint command for CPP.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/namespace/TestNamespace.py b/lldb/test/lang/cpp/namespace/TestNamespace.py
index 40f12988cb51..80a710b25d75 100644
--- a/lldb/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/test/lang/cpp/namespace/TestNamespace.py
@@ -4,7 +4,7 @@ Test the printing of anonymous and named namespace variables.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
index df1b5acb737b..48d633ec398a 100644
--- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
+++ b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
@@ -5,7 +5,7 @@ Test that the expression parser returns proper Unicode strings.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
index 5bac76e70207..e677a24b54fc 100644
--- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -4,7 +4,7 @@ Test that variables with signed types display correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
index aaf16d3a0493..004ec286156b 100644
--- a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
@@ -4,7 +4,7 @@ Tests that C++ member and static variables have correct layout and scope.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldb
diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py
index 4c7636cc74a8..83cfd3edceeb 100644
--- a/lldb/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/test/lang/cpp/stl/TestSTL.py
@@ -4,7 +4,7 @@ Test some expressions involving STL data types.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
index 1ffb76528495..48cd0ae763d0 100644
--- a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -4,7 +4,7 @@ Test the lldb disassemble command on lib stdc++.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
index 9ac570e67b07..577b038eb588 100644
--- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
@@ -4,7 +4,7 @@ Test that template instaniations of std::vector<long> and <short> in the same mo
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index 9154cc696c62..a463bf5f3242 100644
--- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -4,7 +4,7 @@ Test that variables with unsigned types display correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
index 70cc028bf2d7..d70874726e64 100644
--- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -5,7 +5,7 @@ Test that C++ supports wchar_t correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/go/goroutines/TestGoroutines.py b/lldb/test/lang/go/goroutines/TestGoroutines.py
index b3cfb764a369..46d2e61ea886 100644
--- a/lldb/test/lang/go/goroutines/TestGoroutines.py
+++ b/lldb/test/lang/go/goroutines/TestGoroutines.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/go/types/TestGoASTContext.py b/lldb/test/lang/go/types/TestGoASTContext.py
index ac4534a15268..a9d9745b0d02 100644
--- a/lldb/test/lang/go/types/TestGoASTContext.py
+++ b/lldb/test/lang/go/types/TestGoASTContext.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/mixed/TestMixedLanguages.py b/lldb/test/lang/mixed/TestMixedLanguages.py
index e7916863a450..7aedc1d18438 100644
--- a/lldb/test/lang/mixed/TestMixedLanguages.py
+++ b/lldb/test/lang/mixed/TestMixedLanguages.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
index 2403823d5604..291f7eccc6d2 100644
--- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
index 49c29951cf10..38736e70c959 100644
--- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestConstStrings.py b/lldb/test/lang/objc/foundation/TestConstStrings.py
index 11726c90b84f..67c643a50e7b 100644
--- a/lldb/test/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/test/lang/objc/foundation/TestConstStrings.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/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
index 6488b98df141..4ad2698cc38a 100644
--- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
@@ -4,7 +4,7 @@ Test the lldb disassemble command on foundation framework.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py
index 39af9af6da9f..2bf5b7f772b7 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py
@@ -5,7 +5,7 @@ Also lookup objective-c data types and evaluate expressions.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, os.path, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
index ccc93caa0149..ffa0d673afc1 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
@@ -4,7 +4,7 @@ Test more expression command sequences with objective-c.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
index 5fe59c23780f..85b08592ed72 100644
--- a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
@@ -4,7 +4,7 @@ Test SBValue.GetObjectDescription() with the value from SBTarget.FindGlobalVaria
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
index 357346b2ae11..d04660d4360f 100644
--- a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
@@ -4,7 +4,7 @@ Test that Objective-C methods from the runtime work correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/foundation/TestSymbolTable.py b/lldb/test/lang/objc/foundation/TestSymbolTable.py
index 620ada67cfbd..0e2c5ed21b04 100644
--- a/lldb/test/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/test/lang/objc/foundation/TestSymbolTable.py
@@ -4,7 +4,7 @@ Test symbol table access for main.m.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index 5b06ea208b43..9a16fd1284cd 100644
--- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index a0c208b56de8..30126ebdb60e 100644
--- a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
@@ -4,7 +4,7 @@ Test that dynamically discovered ivars of type IMP do not crash LLDB
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
index c00d0d1eaee2..6538f3f868a4 100644
--- a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index 12d4e3792af5..f3d36332923d 100644
--- a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 22d0909a267a..007de7e100d7 100644
--- a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/modules/TestObjCModules.py b/lldb/test/lang/objc/modules/TestObjCModules.py
index f8ed11a539b1..ed925c57edc6 100644
--- a/lldb/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/test/lang/objc/modules/TestObjCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/objc++/TestObjCXX.py b/lldb/test/lang/objc/objc++/TestObjCXX.py
index b553035b3c98..29f52d242b0a 100644
--- a/lldb/test/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/test/lang/objc/objc++/TestObjCXX.py
@@ -4,7 +4,7 @@ Make sure that ivars of Objective-C++ classes are visible in LLDB.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index d02103c7c47b..c6dd996b0a42 100644
--- a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
@@ -4,7 +4,7 @@ Use lldb Python API to test base class resolution for ObjC classes
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
index 3b07320ccc82..cf09d8686c6c 100644
--- a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
index e4708d6c493f..39578d5c0784 100644
--- a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
@@ -4,7 +4,7 @@ Use lldb Python API to make sure the dynamic checkers are doing their jobs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
index 31db76877e42..6c3c1832753c 100644
--- a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index f6a7b74f116a..75cf3e17e00f 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
@@ -4,7 +4,7 @@ Test that we are able to properly report a usable dynamic type
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index cc810d8682ce..cc8573a45c5f 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -4,7 +4,7 @@ Use lldb Python API to test dynamic values in ObjC
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 0be0150a0b01..edbce8268869 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index f49ad7165a73..28b0fd7f201f 100644
--- a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index afdbc61a4748..78f5e5e8823c 100644
--- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
index 28712b9634f4..5ac34ec2aa74 100644
--- a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -9,7 +9,7 @@ optimized it into a register.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/lang/objc/objc-property/TestObjCProperty.py
index 832914313054..963923f15e88 100644
--- a/lldb/test/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/test/lang/objc/objc-property/TestObjCProperty.py
@@ -4,7 +4,7 @@ Use lldb Python API to verify that expression evaluation for property references
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index d74c5a1e9d67..cd9f239b9463 100644
--- a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index edd774335cfe..4ce67749ae8e 100644
--- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
index be29114fdfaf..3f72e7e4c4d4 100644
--- a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 4d3386fd0533..388117a7cead 100644
--- a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
index b5a01f04e333..08126e2f13a4 100644
--- a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/lang/objc/objc-super/TestObjCSuper.py
index 414a1a8d4569..ea9a2e5c7e5a 100644
--- a/lldb/test/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/test/lang/objc/objc-super/TestObjCSuper.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/print-obj/TestPrintObj.py b/lldb/test/lang/objc/print-obj/TestPrintObj.py
index 440f0c4c94cc..4e6f92391ed6 100644
--- a/lldb/test/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/test/lang/objc/print-obj/TestPrintObj.py
@@ -4,7 +4,7 @@ Test "print object" where another thread blocks the print object from making pro
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index dd8e9677d48a..8de6d2dc97a8 100644
--- a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
@@ -4,7 +4,7 @@ Test that objective-c method returning BOOL works correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
index 1b087c6073b2..631d5565f09f 100644
--- a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
@@ -4,7 +4,7 @@ Test that CoreFoundation classes CFGregorianDate and CFRange are not improperly
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
index b36b82fd6d4b..79b7c3e8802d 100644
--- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
@@ -4,7 +4,7 @@ Test that we do not attempt to make a dynamic type for a 'const char*'
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
index 81ec1a8117f4..34054fffc389 100644
--- a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
@@ -4,7 +4,7 @@ Test that we are able to find out how many children NSWindow has
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/lang/objc/real-definition/TestRealDefinition.py
index 8a87e099c5c7..3bf7bb7a9ffa 100644
--- a/lldb/test/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/test/lang/objc/real-definition/TestRealDefinition.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
index 635aa850dba1..3764f26d6633 100644
--- a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
@@ -5,7 +5,7 @@ Test lldb ability to unwind a stack with a function containing a call to the
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 306c147f9fff..130afa842f0b 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -5,7 +5,7 @@ over a thread creation instruction.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/lldbcurses.py b/lldb/test/lldbcurses.py
index f68577c3ae54..3ad7ccc37406 100644
--- a/lldb/test/lldbcurses.py
+++ b/lldb/test/lldbcurses.py
@@ -1,4 +1,4 @@
-import lldb_shared
+import use_lldb_suite
import curses, curses.panel
import sys
diff --git a/lldb/test/lldbpexpect.py b/lldb/test/lldbpexpect.py
index 6110b320dd57..5fee6cff474b 100644
--- a/lldb/test/lldbpexpect.py
+++ b/lldb/test/lldbpexpect.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 1e108cdfd8f1..8ab47fef7722 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -33,7 +33,7 @@ $
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import abc
import gc
diff --git a/lldb/test/lldbutil.py b/lldb/test/lldbutil.py
index c7c8f224b72f..0883c7d38532 100644
--- a/lldb/test/lldbutil.py
+++ b/lldb/test/lldbutil.py
@@ -6,7 +6,7 @@ They can also be useful for general purpose lldb scripting.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import os, sys
diff --git a/lldb/test/logging/TestLogging.py b/lldb/test/logging/TestLogging.py
index 346b660294e4..a738ba8c5a7f 100644
--- a/lldb/test/logging/TestLogging.py
+++ b/lldb/test/logging/TestLogging.py
@@ -4,7 +4,7 @@ Test lldb logging. This test just makes sure logging doesn't crash, and produce
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, string
import lldb
diff --git a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
index e5d4202008ae..4324f0b560a3 100644
--- a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
+++ b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
index bd25db6d64c2..50f18b4bbbeb 100644
--- a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
+++ b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
@@ -4,7 +4,7 @@ Test that clang produces the __apple accelerator tables, for example, __apple_ty
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
index cea72749f55c..4ec5147e54ea 100644
--- a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/order/TestOrderFile.py b/lldb/test/macosx/order/TestOrderFile.py
index fee48e0f082e..b768c3a7afc4 100644
--- a/lldb/test/macosx/order/TestOrderFile.py
+++ b/lldb/test/macosx/order/TestOrderFile.py
@@ -4,7 +4,7 @@ Test that debug symbols have the correct order as specified by the order file.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/macosx/queues/TestQueues.py b/lldb/test/macosx/queues/TestQueues.py
index edd3ff063c76..879f6c36a03a 100644
--- a/lldb/test/macosx/queues/TestQueues.py
+++ b/lldb/test/macosx/queues/TestQueues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index c24ccd5216e3..cb9d7fb53b6e 100644
--- a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py
index d08c7c915c81..12e0939224d3 100644
--- a/lldb/test/macosx/universal/TestUniversal.py
+++ b/lldb/test/macosx/universal/TestUniversal.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/progress.py b/lldb/test/progress.py
index bb71b4bcfcea..734627d4b16e 100755
--- a/lldb/test/progress.py
+++ b/lldb/test/progress.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import six
import sys
diff --git a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
index 4e984cc266cc..c70b485a93af 100644
--- a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
+++ b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
@@ -4,7 +4,7 @@ Test SBBreakpoint APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
index 6366a791f664..00b2bcfe0dba 100644
--- a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
+++ b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
@@ -4,7 +4,7 @@ Test SBType APIs to fetch member function types.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 0e6e053dcad3..067d3875cea4 100644
--- a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -13,7 +13,7 @@ after default construction.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
index e5dcc499dfa3..131146b83b59 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
@@ -4,7 +4,7 @@ Use lldb Python API to disassemble raw machine code bytes
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index 25f43e2a4f97..310d308c70fb 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
@@ -4,7 +4,7 @@ Use lldb Python API to disassemble raw machine code bytes
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/event/TestEvents.py b/lldb/test/python_api/event/TestEvents.py
index 773c1893f474..f63ac134aabc 100644
--- a/lldb/test/python_api/event/TestEvents.py
+++ b/lldb/test/python_api/event/TestEvents.py
@@ -4,7 +4,7 @@ Test lldb Python event APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
index fbe43bc77cac..0bc525753fd4 100644
--- a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
index 807848fff1b7..9c838503802d 100644
--- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/test/python_api/frame/TestFrames.py
index 98f5062e28c6..8cc89f677243 100644
--- a/lldb/test/python_api/frame/TestFrames.py
+++ b/lldb/test/python_api/frame/TestFrames.py
@@ -5,7 +5,7 @@ And other SBFrame API tests.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
index 63288a8e4791..314cc72cf28b 100644
--- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
@@ -4,7 +4,7 @@ Testlldb Python SBFrame APIs IsInlined() and GetFunctionName().
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
index d66a66f1b8dc..a967dc85296e 100644
--- a/lldb/test/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
@@ -4,7 +4,7 @@ Test retrieval of SBAddress from function/symbol, disassembly, and SBAddress API
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
index 1488e520db65..1b49ebc2f155 100644
--- a/lldb/test/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
@@ -4,7 +4,7 @@ Test newly added SBSymbol and SBAddress APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/hello_world/TestHelloWorld.py b/lldb/test/python_api/hello_world/TestHelloWorld.py
index 430d4fbfa4ae..263d41c22d58 100644
--- a/lldb/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/test/python_api/hello_world/TestHelloWorld.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
index 3755bfbd33ff..e5725674f86d 100644
--- a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
index a9f735eedffe..831c68a2f777 100644
--- a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
@@ -4,7 +4,7 @@ Test utility functions for the frame object.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
index 5c4db483431c..d88425462683 100644
--- a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -4,7 +4,7 @@ Test the iteration protocol for some lldb container objects.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
index bb098b9f6900..6c2dd4e83d2a 100644
--- a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -4,7 +4,7 @@ Test the iteration protocol for frame registers.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
index f8a6533fab4f..0632779b12d2 100644
--- a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -4,7 +4,7 @@ Test SBprocess and SBThread APIs with printing of the stack traces using lldbuti
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/module_section/TestModuleAndSection.py b/lldb/test/python_api/module_section/TestModuleAndSection.py
index d12f1ae6ba3f..5af54537b266 100644
--- a/lldb/test/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/python_api/module_section/TestModuleAndSection.py
@@ -4,7 +4,7 @@ Test some SBModule and SBSection APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/objc_type/TestObjCType.py b/lldb/test/python_api/objc_type/TestObjCType.py
index 1255d6fb63fb..f267c4b0eee3 100644
--- a/lldb/test/python_api/objc_type/TestObjCType.py
+++ b/lldb/test/python_api/objc_type/TestObjCType.py
@@ -4,7 +4,7 @@ Test SBType for ObjC classes.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py
index 0f0d32420107..ad007d9e2f0b 100644
--- a/lldb/test/python_api/process/TestProcessAPI.py
+++ b/lldb/test/python_api/process/TestProcessAPI.py
@@ -4,7 +4,7 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/test/python_api/process/io/TestProcessIO.py
index 2dc3f40ac9be..def9f5fcd512 100644
--- a/lldb/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/python_api/process/io/TestProcessIO.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
index 5122a148dc56..a2a2274a22eb 100644
--- a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
@@ -4,7 +4,7 @@ Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/sbdata/TestSBData.py b/lldb/test/python_api/sbdata/TestSBData.py
index 304e8abdbd43..536101b9af97 100644
--- a/lldb/test/python_api/sbdata/TestSBData.py
+++ b/lldb/test/python_api/sbdata/TestSBData.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
index 39c055b854f6..7e216c034c4c 100644
--- a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/section/TestSectionAPI.py b/lldb/test/python_api/section/TestSectionAPI.py
index 4575f90747c9..26002fb3400a 100755
--- a/lldb/test/python_api/section/TestSectionAPI.py
+++ b/lldb/test/python_api/section/TestSectionAPI.py
@@ -4,7 +4,7 @@ Test SBSection APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
from lldbtest import *
diff --git a/lldb/test/python_api/signals/TestSignalsAPI.py b/lldb/test/python_api/signals/TestSignalsAPI.py
index 4dc8e651e279..3ee42de7870c 100644
--- a/lldb/test/python_api/signals/TestSignalsAPI.py
+++ b/lldb/test/python_api/signals/TestSignalsAPI.py
@@ -4,7 +4,7 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/symbol-context/TestSymbolContext.py b/lldb/test/python_api/symbol-context/TestSymbolContext.py
index b34960ac4f9c..4fb3a8ea6aaf 100644
--- a/lldb/test/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/python_api/symbol-context/TestSymbolContext.py
@@ -4,7 +4,7 @@ Test SBSymbolContext APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/target/TestTargetAPI.py b/lldb/test/python_api/target/TestTargetAPI.py
index 8fbcc086f666..d3367aa6b24a 100644
--- a/lldb/test/python_api/target/TestTargetAPI.py
+++ b/lldb/test/python_api/target/TestTargetAPI.py
@@ -4,7 +4,7 @@ Test SBTarget APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os, time
diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py
index e76bb658f383..82984205e63f 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/python_api/thread/TestThreadAPI.py
@@ -4,7 +4,7 @@ Test SBThread APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/type/TestTypeList.py b/lldb/test/python_api/type/TestTypeList.py
index 9ea401afe967..5c79a9528fc4 100644
--- a/lldb/test/python_api/type/TestTypeList.py
+++ b/lldb/test/python_api/type/TestTypeList.py
@@ -4,7 +4,7 @@ Test SBType and SBTypeList API.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/TestValueAPI.py b/lldb/test/python_api/value/TestValueAPI.py
index d8776d506ae2..525429b17f93 100644
--- a/lldb/test/python_api/value/TestValueAPI.py
+++ b/lldb/test/python_api/value/TestValueAPI.py
@@ -4,7 +4,7 @@ Test some SBValue APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
index 1b461d2981ee..18c34d3af71f 100644
--- a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
@@ -4,7 +4,7 @@ Test some SBValue APIs.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
index 3ce749fcfcfb..c62c130d9c43 100644
--- a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -5,7 +5,7 @@ supports iteration till the end of list is reached.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
index e6d6d30c6e65..b7f53c160c61 100644
--- a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, sys, time
import lldb
diff --git a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
index 161804ffbb5e..2e513a510f51 100644
--- a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
@@ -4,7 +4,7 @@ Use lldb Python SBValue API to create a watchpoint for read_write of 'globl' var
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
index af72f6850540..b2cb8de82d78 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -4,7 +4,7 @@ Use lldb Python SBWatchpoint API to set the ignore count.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
index 031a4bf6d187..c7bc94d859f4 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
@@ -4,7 +4,7 @@ Use lldb Python SBTarget API to iterate on the watchpoint(s) for the target.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 582e60ebe2c8..8d0b4af8fe21 100644
--- a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -4,7 +4,7 @@ Test watchpoint condition API.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 774288a05c37..016ca78e90d8 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -4,7 +4,7 @@ Use lldb Python SBValue.WatchPointee() API to create a watchpoint for write of '
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index 2051635c13a0..28a8f809bb13 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -4,7 +4,7 @@ Use lldb Python SBtarget.WatchAddress() API to create a watchpoint for write of
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import re
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index c48ef7b01f42..da30201f1005 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -4,7 +4,7 @@ Test lldb settings command.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/settings/quoting/TestQuoting.py b/lldb/test/settings/quoting/TestQuoting.py
index 1c1bb8f5f469..91a143f70cde 100644
--- a/lldb/test/settings/quoting/TestQuoting.py
+++ b/lldb/test/settings/quoting/TestQuoting.py
@@ -4,7 +4,7 @@ Test quoting of arguments to lldb commands
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time, re
import lldb
diff --git a/lldb/test/source-manager/TestSourceManager.py b/lldb/test/source-manager/TestSourceManager.py
index 3301704f3694..1fc6cd19cabc 100644
--- a/lldb/test/source-manager/TestSourceManager.py
+++ b/lldb/test/source-manager/TestSourceManager.py
@@ -11,7 +11,7 @@ o test_modify_source_file_while_debugging:
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
from lldbtest import *
diff --git a/lldb/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/terminal/TestSTTYBeforeAndAfter.py
index 79a40db060f3..4032f023c344 100644
--- a/lldb/test/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/test/terminal/TestSTTYBeforeAndAfter.py
@@ -4,7 +4,7 @@ Test that 'stty -a' displays the same output before and after running the lldb c
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/test_results.py b/lldb/test/test_results.py
index b6ef584c16d7..17dcc209c4a5 100644
--- a/lldb/test/test_results.py
+++ b/lldb/test/test_results.py
@@ -10,7 +10,7 @@ within the LLDB test suite.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import argparse
import inspect
diff --git a/lldb/test/tools/lldb-mi/TestMiExit.py b/lldb/test/tools/lldb-mi/TestMiExit.py
index 4bed4cffb9c4..038710e8c5b3 100644
--- a/lldb/test/tools/lldb-mi/TestMiExit.py
+++ b/lldb/test/tools/lldb-mi/TestMiExit.py
@@ -4,7 +4,7 @@ Test that the lldb-mi driver exits properly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiFile.py b/lldb/test/tools/lldb-mi/TestMiFile.py
index 7020b6963b56..c48119c8c0b9 100644
--- a/lldb/test/tools/lldb-mi/TestMiFile.py
+++ b/lldb/test/tools/lldb-mi/TestMiFile.py
@@ -4,7 +4,7 @@ Test lldb-mi -file-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
index b7680e38d6ab..a3f54239e685 100644
--- a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
+++ b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
@@ -4,7 +4,7 @@ Test lldb-mi -gdb-set and -gdb-show commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
index bc4b7a944c35..caf9a49d47bf 100644
--- a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
+++ b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
@@ -4,7 +4,7 @@ Test lldb-mi =library-loaded notifications.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/TestMiPrompt.py b/lldb/test/tools/lldb-mi/TestMiPrompt.py
index e0038af30f83..4f9e2ac7b0d7 100644
--- a/lldb/test/tools/lldb-mi/TestMiPrompt.py
+++ b/lldb/test/tools/lldb-mi/TestMiPrompt.py
@@ -4,7 +4,7 @@ Test that the lldb-mi driver prints prompt properly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
index f0beb0870faf..056dd29b57af 100644
--- a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
@@ -4,7 +4,7 @@ Test lldb-mi -break-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/control/TestMiExec.py b/lldb/test/tools/lldb-mi/control/TestMiExec.py
index 41ccfc70b577..11f4e6374c06 100644
--- a/lldb/test/tools/lldb-mi/control/TestMiExec.py
+++ b/lldb/test/tools/lldb-mi/control/TestMiExec.py
@@ -4,7 +4,7 @@ Test lldb-mi -exec-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/data/TestMiData.py b/lldb/test/tools/lldb-mi/data/TestMiData.py
index 8d7b370d43e4..94e5042b3bf3 100644
--- a/lldb/test/tools/lldb-mi/data/TestMiData.py
+++ b/lldb/test/tools/lldb-mi/data/TestMiData.py
@@ -4,7 +4,7 @@ Test lldb-mi -data-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import lldbmi_testcase
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
index 13797e0307ad..594b7595e1c8 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
+++ b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
@@ -4,7 +4,7 @@ Test lldb-mi can interpret CLI commands directly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
index 0667b5f992bb..ccdc64213b8c 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
+++ b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
@@ -4,7 +4,7 @@ Test lldb-mi -interpreter-exec command.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/test/tools/lldb-mi/lldbmi_testcase.py
index 071cf50ff512..944dca0af5e0 100644
--- a/lldb/test/tools/lldb-mi/lldbmi_testcase.py
+++ b/lldb/test/tools/lldb-mi/lldbmi_testcase.py
@@ -4,7 +4,7 @@ Base class for lldb-mi test cases.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
index 545d56843c24..d3f22c5ff0f2 100644
--- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
@@ -4,7 +4,7 @@ Test that the lldb-mi handles signals properly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/test/tools/lldb-mi/stack/TestMiStack.py
index 921e5c201299..1126f698c046 100644
--- a/lldb/test/tools/lldb-mi/stack/TestMiStack.py
+++ b/lldb/test/tools/lldb-mi/stack/TestMiStack.py
@@ -4,7 +4,7 @@ Test lldb-mi -stack-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
index 404309c9b06d..5f07e337cdf2 100644
--- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
@@ -4,7 +4,7 @@ Test lldb-mi startup options.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
index ca98822cd2db..8bbe552c6d55 100644
--- a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -4,7 +4,7 @@ Test lldb-mi -symbol-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
index f51fff0edd19..df40a81b4ec2 100644
--- a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
+++ b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
@@ -4,7 +4,7 @@ Test that the lldb-mi driver understands MI command syntax.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/test/tools/lldb-mi/target/TestMiTarget.py
index 92384dbe21f1..d10051b44218 100644
--- a/lldb/test/tools/lldb-mi/target/TestMiTarget.py
+++ b/lldb/test/tools/lldb-mi/target/TestMiTarget.py
@@ -4,7 +4,7 @@ Test lldb-mi -target-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
index e2c2cfd4a113..a6e08780f360 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
+++ b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
@@ -5,7 +5,7 @@ Test lldb-mi -gdb-set and -gdb-show commands for 'print option-name'.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/test/tools/lldb-mi/variable/TestMiVar.py
index 1978de16d48e..d4973e4663f7 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiVar.py
+++ b/lldb/test/tools/lldb-mi/variable/TestMiVar.py
@@ -4,7 +4,7 @@ Test lldb-mi -var-xxx commands.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldbmi_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
index 0980b45a3fe0..8ec7fd6f1e6d 100644
--- a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
@@ -4,7 +4,7 @@ Tests the binary ($x) and hex ($m) memory read packets of the remote stub
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import lldb
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
index b0e1e3fe3bf3..9667c76609ad 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index a1977be5b0af..5ca05ea888e9 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index 7f3ecfc6e072..e92591820233 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
index 2bfe3df96683..a6f1d14ad6c5 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 3c3b3ffc6500..9c2363ac4da8 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index c26ad96251b0..ef2f3ca179e1 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index 355f0cb6e198..0155af52f9f9 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index 23ff0b806128..e0ca9b151422 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index bbea58956dd9..084bb44fb627 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import sys
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
index 48189b38a8fb..267ce65d1c60 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
from lldbtest import *
diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
index fbde859525fc..a254269e25fc 100644
--- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
@@ -12,7 +12,7 @@ the initial set of tests implemented.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import gdbremote_testcase
diff --git a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
index ee93e0bf984a..68d2b2ffa566 100644
--- a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py
index 7a780d82d652..8da1fda2d525 100644
--- a/lldb/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py
@@ -4,7 +4,7 @@ Base class for gdb-remote test cases.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import errno
import os
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index dd4a0f77b83d..1f00a7d3594b 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import signal
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 0ee76dd5d46f..7b3186b9a7c1 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import gdbremote_testcase
import signal
diff --git a/lldb/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
index a635878f5f26..8014a79550b0 100644
--- a/lldb/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
@@ -3,7 +3,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os
import os.path
diff --git a/lldb/test/tools/lldb-server/socket_packet_pump.py b/lldb/test/tools/lldb-server/socket_packet_pump.py
index a6f42edb398e..1fd52bc0f26a 100644
--- a/lldb/test/tools/lldb-server/socket_packet_pump.py
+++ b/lldb/test/tools/lldb-server/socket_packet_pump.py
@@ -1,7 +1,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import re
import select
diff --git a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
index 6391d47a39eb..e21191f0ee4c 100644
--- a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import unittest2
import os.path
diff --git a/lldb/test/types/HideTestFailures.py b/lldb/test/types/HideTestFailures.py
index e08172da5379..77a04fe23d15 100644
--- a/lldb/test/types/HideTestFailures.py
+++ b/lldb/test/types/HideTestFailures.py
@@ -4,7 +4,7 @@ Test that variables of integer basic types are displayed correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import sys
diff --git a/lldb/test/types/TestFloatTypes.py b/lldb/test/types/TestFloatTypes.py
index 6b519c18b371..133b98dae154 100644
--- a/lldb/test/types/TestFloatTypes.py
+++ b/lldb/test/types/TestFloatTypes.py
@@ -4,7 +4,7 @@ Test that variables of floating point types are displayed correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestFloatTypesExpr.py b/lldb/test/types/TestFloatTypesExpr.py
index 5d74b42b4717..64f01976e3e9 100644
--- a/lldb/test/types/TestFloatTypesExpr.py
+++ b/lldb/test/types/TestFloatTypesExpr.py
@@ -4,7 +4,7 @@ Test that variable expressions of floating point types are evaluated correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestIntegerTypes.py b/lldb/test/types/TestIntegerTypes.py
index bb26e88e8c2f..bf1cd5c7958b 100644
--- a/lldb/test/types/TestIntegerTypes.py
+++ b/lldb/test/types/TestIntegerTypes.py
@@ -4,7 +4,7 @@ Test that variables of integer basic types are displayed correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestIntegerTypesExpr.py b/lldb/test/types/TestIntegerTypesExpr.py
index 5feb34de666c..27105c87c97a 100644
--- a/lldb/test/types/TestIntegerTypesExpr.py
+++ b/lldb/test/types/TestIntegerTypesExpr.py
@@ -4,7 +4,7 @@ Test that variable expressions of integer basic types are evaluated correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import AbstractBase
import lldb
diff --git a/lldb/test/types/TestRecursiveTypes.py b/lldb/test/types/TestRecursiveTypes.py
index 34846ba42504..e394177587a1 100644
--- a/lldb/test/types/TestRecursiveTypes.py
+++ b/lldb/test/types/TestRecursiveTypes.py
@@ -4,7 +4,7 @@ Test that recursive types are handled correctly.
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import lldb
import lldbutil
diff --git a/lldb/test/lldb_shared.py b/lldb/test/use_lldb_suite.py
index 4d7a92da7612..daeafe80dd5b 100644
--- a/lldb/test/lldb_shared.py
+++ b/lldb/test/use_lldb_suite.py
@@ -17,6 +17,6 @@ def find_lldb_root():
lldb_root = find_lldb_root()
if lldb_root is not None:
import imp
- module = imp.find_module("lldb_shared_base", [lldb_root])
+ module = imp.find_module("use_lldb_suite_root", [lldb_root])
if module is not None:
- imp.load_module("lldb_shared_base", *module) \ No newline at end of file
+ imp.load_module("use_lldb_suite_root", *module) \ No newline at end of file
diff --git a/lldb/test/warnings/uuid/TestAddDsymCommand.py b/lldb/test/warnings/uuid/TestAddDsymCommand.py
index b474b60ca905..8e5d31a72262 100644
--- a/lldb/test/warnings/uuid/TestAddDsymCommand.py
+++ b/lldb/test/warnings/uuid/TestAddDsymCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import lldb_shared
+import use_lldb_suite
import os, time
import lldb
diff --git a/lldb/third_party/Python/module/unittest2/unittest2/result.py b/lldb/third_party/Python/module/unittest2/unittest2/result.py
index af31fbfd8881..2e4994d1d825 100644
--- a/lldb/third_party/Python/module/unittest2/unittest2/result.py
+++ b/lldb/third_party/Python/module/unittest2/unittest2/result.py
@@ -1,6 +1,6 @@
"""Test result object"""
-import lldb_shared
+import use_lldb_suite
import sys
import traceback
diff --git a/lldb/lldb_shared_base.py b/lldb/use_lldb_suite_root.py
index 466de5d7a4a9..466de5d7a4a9 100644
--- a/lldb/lldb_shared_base.py
+++ b/lldb/use_lldb_suite_root.py