summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r--lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/dosep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/dotest.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/dotest_channels.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/help/TestHelp.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbcurses.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbpexpect.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbutil.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/logging/TestLogging.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/settings/TestSettings.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/test_results.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/use_lldb_suite.py22
-rw-r--r--lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py2
392 files changed, 391 insertions, 413 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py b/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
index 009d58cd5b0..b925afe1b70 100644
--- a/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
+++ b/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
@@ -4,7 +4,7 @@ Verify the default cache line size for android targets
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
index 7cec399a40a..de18469fa59 100644
--- a/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, re
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
index 8a783e964e5..67dca2273d8 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, re
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
index 237d084bc5c..ff1f0c52208 100644
--- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
@@ -3,7 +3,7 @@
from __future__ import print_function
# __package__ = "lldbsuite.test"
-import use_lldb_suite
+
import os, re
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py b/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
index b07372c0fc5..8a78d21e797 100644
--- a/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
@@ -4,7 +4,7 @@ Test some ARM instruction emulation.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
index c652a556236..25ca13a3bfd 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
index 37d0e7336a4..f9c1940bc25 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index 56eba48e181..a7c17bcd346 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 964a868da5a..2432f335b19 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
index dcd5b2ae065..eca768afa2f 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
index bb4219dc51e..fb629ff27bb 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index 1cbd330e4bc..9e758bfde53 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
index 9808dc83373..c815c735588 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index e8884930e08..c26f4256502 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
index 64bf9e924c9..ef3179fa43a 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index 0a6d2c4eddf..757e9b9704a 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py
index d55d48e1043..5a37850bc50 100644
--- a/lldb/packages/Python/lldbsuite/test/dosep.py
+++ b/lldb/packages/Python/lldbsuite/test/dosep.py
@@ -34,7 +34,7 @@ echo core.%p | sudo tee /proc/sys/kernel/core_pattern
from __future__ import print_function
-import use_lldb_suite
+
# system packages and modules
import asyncore
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 8b235b1cb57..181e26b6602 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -19,7 +19,7 @@ for available options.
"""
from __future__ import print_function
-import use_lldb_suite
+import sys
import lldbsuite
import lldbtest_config
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_channels.py b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
index e1922876b49..3d1fa719bbb 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_channels.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
@@ -16,7 +16,7 @@ framework.
from __future__ import print_function
-import use_lldb_suite
+
import asyncore
import socket
diff --git a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
index 4d8ea35e920..5c98cfcecf2 100644
--- a/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
index 2ff0840c637..3756b4a8cea 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -4,7 +4,7 @@ Test calling std::String member functions.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
index 5832bf41785..f6d63885248 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
index 700c22ca4b9..9138af0b0b4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
@@ -9,7 +9,7 @@ Note:
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
index 4cae0d335eb..abf48742567 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
index 1749365778f..0e766ac2953 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
index 45b64c4ed2b..90e847fd5fa 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
index 5546841f4e8..0430fa55f99 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
index e4948fd6623..3f47206480c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
index 7140fc349f2..fdc981ea178 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
@@ -6,7 +6,7 @@ expected in a SyntheticChildrenProvider
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py b/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
index d725256b206..4b813ced70d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
@@ -9,7 +9,7 @@ o test_expr_options:
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index b7ed53ed67d..7b0707cdf22 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -4,7 +4,7 @@ Test that we can p *objcObject
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
index 36ff8d22346..9d7359fb2d4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
index cf2bf13d24d..3ea5b704065 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
@@ -4,7 +4,7 @@ Test that nested persistent types work.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
index 213a91f3bb7..47c6675511f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
@@ -4,7 +4,7 @@ Test that lldb persistent types works correctly.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
index e945597c808..e148fcd8959 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
@@ -4,7 +4,7 @@ Test that lldb persistent variables works correctly.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
index 7661f720b4b..e415b92a43a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
@@ -4,7 +4,7 @@ Test that the po command acts correctly.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
index b571639f2a6..302b14b7360 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
@@ -4,7 +4,7 @@ Test the robustness of lldb expression parser.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
index 964bc6a26eb..fb16d2a9332 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
index fb2d32e3b14..ce3e51d0514 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
index 765359e77ad..39883180795 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
@@ -13,7 +13,7 @@ o test_expr_commands_can_handle_quotes:
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
index eff37ea7c35..578a037e9f0 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
@@ -4,7 +4,7 @@ Test some more expression commands.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
index a3118a594bd..2f16cb49a95 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index fff1e4085cc..5b023350911 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
index c98146b0ed6..1bce5bed491 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
index c607abef0b1..683ef044f73 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py b/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
index 09cf4598069..02e1b955185 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
index fd94770ce15..a96386b312a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
index 7b1498d93a7..60e2ed14342 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
index 2d4ac2d8d00..87b5cffac6e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
@@ -4,7 +4,7 @@ Test process attach/resume.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
index 73d5f228647..2332245699a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
index 118356eafdf..d31412bc783 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index e8be3048846..8cf7539432b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -4,7 +4,7 @@ Test lldb breakpoint command add/list/delete.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
index 2b36453bb99..7a9cc744d52 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index e29a0f6d476..1ea71cbde45 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 8474a095d91..e72a77d9875 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 4337cde7d33..b7edf2a6e4d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -4,7 +4,7 @@ Test lldb breakpoint ids.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index ce3dfd4b4d5..8a83cb627f7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
@@ -4,7 +4,7 @@ Test breakpoint ignore count features.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 0bf33a4b48a..5c4dc219a10 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index 5e9783c3152..29afec20233 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -4,7 +4,7 @@ Test breakpoint command for different options.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
index 06678fcdd0e..e1de38bcad8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
index 1700dc7d2a2..3fa3c6297df 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index 7289efc9081..dea206b9e9d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -4,7 +4,7 @@ Test lldb breakpoint ids.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
index b3ae96185ff..f7a19098b49 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index 8d9a011730e..f2693e6ed59 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index c31d36f2f44..d04178bda78 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -5,7 +5,7 @@ another source file) works correctly.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
index 667be54252b..648a0f5ea07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
@@ -5,7 +5,7 @@ parser.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
index a2a04b81c39..312c91517f9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
@@ -4,7 +4,7 @@ Test the command history mechanism
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
index 5b55287438a..2c48efa863b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
index f8b6a92e43b..542ee7a1e5f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
@@ -4,7 +4,7 @@ Test lldb Python commands.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
index 9650c25cda7..691045ae82e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
index 758e6c597b1..9800a08c06d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
index 8d8d7f1c53f..fb65305d205 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
@@ -1,4 +1,4 @@
-import use_lldb_suite
+
import six
def command(debugger, command, result, internal_dict):
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
index e74686ed619..60b31b89f6d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
@@ -1,4 +1,4 @@
-import use_lldb_suite
+
import six
def command(debugger, command, result, internal_dict):
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
index 119ca2fda95..013803e698a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
index 8703952321e..f1f8e19df4a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
@@ -4,7 +4,7 @@ Test the lldb command line completion mechanism.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
index b5a2005662f..5b1545452f2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
index 00e66a01566..94cdfdfeb34 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
index 06926d20113..7cd2a49b471 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index ebf122c75af..8166d1540ca 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index 188e13f53ac..daf14babb00 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index bfa4118b2b2..3ca98af4db2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index fd5b784a2fd..0f254a67d5a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index a6f11002b54..1659ade74a0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index 0b5d3eec8ce..df3bef091c8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index abb7f812e0e..94df520d29b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index 62ab3dc369b..e12ddca2eea 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
@@ -5,7 +5,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
index bf0875272be..e11c45e9038 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
index 5f63b300395..1281f17ab58 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 930386a4328..86cd3c42728 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index 84d2ee26df8..d202ff5d64e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
index 74b092d9723..324b372cb11 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index 7c49ef1ed2a..38e700812d0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index fe3ec74de85..ca8858dbad9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
index 0d54ee27161..e01f1b6679f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
index 52416703d24..a87a2ed2d43 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
index 314a828c548..18ee31a8610 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time, re
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
index e656e50d9ef..167cb2b887a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
@@ -5,7 +5,7 @@ corruption).
from __future__ import print_function
-import use_lldb_suite
+
import os, time, re
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
index 6b6f6351208..70a98f9c2ca 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
index 3f594da7df0..d0ca73d3251 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
index b610f77889b..384f6130d0c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
index 017ad237b9c..fcbfb0a8f0e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
index d82c9b3f469..942124255f5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
index c4aaaa979ee..5e6ec251932 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
index 154547b560e..9771a819aa6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
index c3d6d12c94b..f8cd65be093 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
index 787fadcf70d..e9caef16b57 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
index 0f94199bdde..bc6b1abd607 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
index cf9ebf5403a..e21c4e94c2c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
index 36c20b29db5..dd39188f631 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
index c0eb29d69fe..9e73009aba8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
index 0cd4746390a..ed4313657e9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index 99be41e531f..09cb6459479 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index 901fbeb1b66..8d6e5df37a5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index 8474ca1f863..5cb7c82c9e0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index c03c70e465e..555351998c2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index a2897e163a2..3c28b68056f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
index 3c72d007a05..a12f9c841a7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index 5a13bab5672..13d493ecbdc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index 8ed4439a202..6c558001bb0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
index e2262ed7ded..4fb6176e9e4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
index 54d371982cf..bf98559cd0c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index cd50d78be2f..13b84e9f74c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
index 19432cb0083..2873e35368f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index 20e7664c278..0550f57ae62 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
index e4afdd53e15..6b70a88b9f2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index 3e5922bbf0c..dba2816d264 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index d98a967e21d..5899469651d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
index 37d5623cabd..4d060c332f9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index 30d0e64399f..05899a24ad2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -4,7 +4,7 @@ Check that vector types format properly
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
index 65acd0919d8..f10736bd75c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
index 41b37ab0e50..68b8416add3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
@@ -4,7 +4,7 @@ Test some lldb command abbreviations.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
index d1d3d126585..ac039990b5b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
index 97b43d8ef18..88cd1c46a5e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py b/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
index 552f46b83de..9321a308a83 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
index 1245b3f176f..a54b45822a6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
index 94313bb27c2..19a2dba2109 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py b/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
index 8f5da9239e1..cc962150bc8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
@@ -4,7 +4,7 @@ Test the command history mechanism
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
index 97459682430..69e977e6343 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
index 860ce5f85f6..6462a0b4428 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
index 8b40467c6f2..afac2f46a85 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 49d286361e8..8afc81f6892 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
index d815358e635..8a6d4ab2acb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time, sys
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index 441dc728255..c7abf346441 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
index a1356b1de65..8f712dc2111 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
index 7e1193f0757..af4419c37fc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
index 0bab6b0245a..1316a01c924 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
index 7241f93a9c2..1197d91b4e9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
@@ -4,7 +4,7 @@ Test the 'memory read' command.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index b396d28fbd3..5c53cfaf912 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
index 8336c1a2d3e..7a6c98d92c3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
index 72b9e45d591..4f4a22ed606 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
@@ -6,7 +6,7 @@ foreign-architecture object files.
from __future__ import print_function
-import use_lldb_suite
+
import os.path
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
index 7e081037197..f718b62f95e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
@@ -3,7 +3,7 @@ Test some lldb command abbreviations.
"""
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
index 8014f0da475..6b3eedaf603 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
@@ -4,7 +4,7 @@ Test some lldb platform commands.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
index 80e7430c53b..b62c30bcf4e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -4,7 +4,7 @@ Test that plugins that load commands work correctly.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
index 5189d7a375a..ebd96d9d4c0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
index da168c13980..2c7dd2b83d1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
@@ -4,7 +4,7 @@ Test basics of mini dump debugging.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
index 890a0f75640..0315748ef5b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
@@ -4,7 +4,7 @@ Test process attach.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
index cffb378ce2d..f5e6b71a623 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
@@ -4,7 +4,7 @@ Test denied process attach.
from __future__ import print_function
-import use_lldb_suite
+
import os
import time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
index aba1151201d..25be37b2b12 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
index dac34ae6fa4..bc1a6f75b87 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
@@ -4,7 +4,7 @@ Test lldb process launch flags.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
index ea475f8ad07..fcb493bc9d9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
@@ -4,7 +4,7 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py b/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
index f5be2e5ea0d..d508c357efe 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
@@ -4,7 +4,7 @@ Test the 'register' command.
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
index b3294ca4c23..0ed56de3569 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
@@ -3,7 +3,7 @@ Test that argdumper is a viable launching strategy.
"""
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import os
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
index 3ef105f4953..42ae41435e3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
@@ -4,7 +4,7 @@ Test getting return-values correctly when stepping out
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
index 550f734a629..3acad5f87be 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
index 8847f9a54aa..971b82a7c75 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time, signal
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
index 43d6bf7296a..feed5bfb3c7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
index c2f89c42d51..39e7753397d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
index 95f9abf7054..6a2dd74d395 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index def62df5219..6c1f2c3da41 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
index 2b040304ae0..753491339c4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -4,7 +4,7 @@ Test lldb target stop-hook command.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
index acc172c6db3..fcdee6918aa 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
index a561657ed71..88ea847d682 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
index 86a90667094..0ab965d2aa1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
@@ -4,7 +4,7 @@ Test some target commands: create, list, select, variable.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import sys
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
index cb294ff70e8..8184ddcfbf4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index 6b11387d38c..43397a12239 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
index 27876fd82c3..d829025ebe2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index f353e2056a0..6e7e11b3e33 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
index 46fc853212d..6b9eb321a0e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
@@ -4,7 +4,7 @@ Test thread creation after process attach.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
index 32ae33f1230..046a86509c0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index e6e9c316f99..f999ffe108f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
index 1460b006ed8..f1f365fee11 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
index e0f580dd94b..be49a210f0f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
@@ -4,7 +4,7 @@ Test jumping to different places.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
index 4f252b5ead3..9dd21241221 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
index ec88b75502f..e62f495ea3c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
@@ -4,7 +4,7 @@ Test thread states.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
index 9b79aed89a8..b2d966c4c0f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
index 83db997a953..53d22f68180 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
@@ -4,7 +4,7 @@ Test number of threads.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
index 2bfd8d5b400..5bf32bffec2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py b/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
index 337b00f92b7..28aab33b40a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
@@ -4,7 +4,7 @@ Test lldb command aliases.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
index 3086dd7f530..5a238b7d354 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
@@ -4,7 +4,7 @@ Check that types only get completed when necessary.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
index fe9a85de79b..ca0b1f1d1e5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
@@ -4,7 +4,7 @@ Test type lookup command.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
index b24644248ba..a419500f7a1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
index 4fb1bcf2b09..ddfb1122b6f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
index 6b088667c5e..e8fb5634b25 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
@@ -12,7 +12,7 @@ after escaping some special characters).
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
index bcd9058c582..763ecc94c2e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
index b9fe4b0e1be..0e0e70d8013 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
index 7882449e082..57467c38d5f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -4,7 +4,7 @@ Test my first lldb watchpoint.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
index de79e062263..2318214a0d5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
index dad44e9ae70..c1002ed0339 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 970f1a2af95..21f1fb68426 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
index 2d79e0a2b6d..339de45a085 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index bb0ff78485f..f2bf9086633 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -4,7 +4,7 @@ Test 'watchpoint command'.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
index 79d523c8710..a476aebb8db 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -4,7 +4,7 @@ Test 'watchpoint command'.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index 96f9258cc4e..355204a4ce1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
index a5ff80e3d18..e4d6e019c20 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
index 583d481d83f..73752d2d18d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index e310ba63814..6bdac702484 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
index 14a5bb8fb6e..27c759e6fb6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
index 33b54a4d3b4..b145cf63f62 100644
--- a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
+++ b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
@@ -6,7 +6,7 @@ See also CommandInterpreter::OutputFormattedHelpText().
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
index 08e77feea5b..7cb66ba8238 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
index daeb8298e6d..e835fb09649 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
index 5c9e9a4c9f4..de7a333a18f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
index c19b80a6291..8f1c3be2283 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
index 8d516062e69..d856e862778 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
index 5ed455020a6..b0c5c882f6a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
index ebcad21b3ad..33c0de2d72d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
index 480e0db4f5d..2f9f1d10b58 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
index 21ba39af774..a881117ed7a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
index 661e395d9dc..cd31f9dbacf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
index ab102ca7613..7ef1f246bfd 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
index b9cc6530a29..ab810249609 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
index cd9151b4760..954d1bac636 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index 43a55118e77..a9cb46ca137 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
index 78e73fe7d82..c7a3de4b684 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
index e05efcc5fad..c3ed3f933ab 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
index feb3a301b47..0d9e22ec3ad 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
index 594c0528963..b9f9f0d4cf0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 432df325910..6c06f3750d1 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
index b1065784142..9bb1faf4ba6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
index c360ad6182d..d47d1b7dde4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
index a3eb10f60f9..b67e53c3074 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 149bb99306e..595d075d518 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
index 05b0894625d..4e23cd89928 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
index a7782d27ccb..56e81c56cfa 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index 7d0ec535475..51c145c7b7c 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index c91fe74cbfa..65cf0b361d8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
@@ -4,7 +4,7 @@ Test lldb exception breakpoint command for CPP.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
index 6b88e783142..ab6b83bed9b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
index cf118e6c1c3..636a82b425d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
index 5a6025c5910..51e6d4579e2 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
index 908bc735e32..1c41b1b6f57 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
index 0f43accfc02..6dba1398947 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
@@ -4,7 +4,7 @@ Test some expressions involving STL data types.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
index 32170991bc8..75e1510e1f7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -4,7 +4,7 @@ Test the lldb disassemble command on lib stdc++.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
index a2c2f875739..2cbb1a191e6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index 0d2b01c02fa..c137592558e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
index 3b60c493348..f9cdbca16e5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -5,7 +5,7 @@ Test that C++ supports wchar_t correctly.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
index cbad2557212..35961ebd1d9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
index e57ef8868f6..8da31e9e81f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
index 73fd40a4acd..d11f03b878a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time, re
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
index b862b5f3efa..6a1cde1a3cb 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
index a8ad09c9ce8..207518abc91 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
index 40d640f2e94..a9298dd81cf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
@@ -5,7 +5,7 @@ parser.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
index 55031cd58a2..88db12e9593 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
@@ -4,7 +4,7 @@ Test the lldb disassemble command on foundation framework.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
index ae9776af7da..8358bd5e923 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, os.path, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
index 40ba89bd03b..b61a7702f1f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
@@ -4,7 +4,7 @@ Test more expression command sequences with objective-c.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
index d50f5d62847..a85f0fec963 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
index da110bd07f3..8f191721d89 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
index cb947b5055b..72952c1878b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
@@ -4,7 +4,7 @@ Test symbol table access for main.m.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index fbff0943a60..e85dd8f48de 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index 7202d085869..9ed2bb98e6e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
index 58ada0dadfa..2c052aae3ba 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index eac3ef6a07b..8667e628d46 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 1a3cf6cdf05..73a5c93097e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
index 8efaf1dc494..04fc0728181 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
index 3e7588ae997..38ef853ae11 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index b81df8cec59..5d2414eed8f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
index ff8d6699403..f7ce2809081 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
index 4658fd05007..ce2da08c6ed 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
index 94f00e8e407..2a978bc9c02 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index 10f9cf71e1d..b9e84541e2d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index 52b5adcc560..acddfb8bd64 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 5c6fffe7091..6be1d379c8e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index 3c419b8a1aa..78c7123eefc 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index 7e895790c80..ca77de26182 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
index fcad3dfd807..a4a202e3f94 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -9,7 +9,7 @@ optimized it into a register.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
index cd998f104a5..c22a1f1ad53 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index 9420001d58e..4bcc10b8b88 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index 4e8ceaafa49..89ef1e7b689 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
index 71c566e9b56..1df416d4513 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 67693a8bb60..36cde21c9d6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
index 20868d83f54..010de218082 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
index 7bac770343d..84d147f632d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
index e2fcc52d3d0..5c52cc0e069 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index 2c9dd71cb0f..38551f671a9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
index 6dbda623556..0902527d424 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
index ed796964bb1..42120a57834 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
index b84c5062111..b95d9510603 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
index 24ce7ff6416..30fd2a5b0f6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
index 432335e4ee2..ea742341512 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 56d30f74d9c..c6d9afb0200 100644
--- a/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -5,7 +5,7 @@ over a thread creation instruction.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lldbcurses.py b/lldb/packages/Python/lldbsuite/test/lldbcurses.py
index 3ad7ccc3740..e1fcdd1a009 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbcurses.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbcurses.py
@@ -1,4 +1,4 @@
-import use_lldb_suite
+
import curses, curses.panel
import sys
diff --git a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
index 5fee6cff474..055a8ea5361 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import lldb
from lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 1c26b0a961f..758824cde5d 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -33,7 +33,7 @@ $
from __future__ import print_function
-import use_lldb_suite
+
import abc
import gc
diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py
index 0883c7d3853..807a4e81b81 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -6,7 +6,7 @@ They can also be useful for general purpose lldb scripting.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import os, sys
diff --git a/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py b/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py
index 8c71eca6b83..f8558a758ee 100644
--- a/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time, string
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
index dc15d054306..497f695d7cc 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
index 89de99f009d..fad14db4100 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
index 0ebf66b0d8b..4f98865ca5a 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py b/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
index dea52ca8789..6541169798a 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py b/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
index e7d4045ce2a..492d1d3bda3 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index 1b66eea4fd4..297223c3e84 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
index b2822a360af..4b722b0c1d8 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
index 681f22c6032..1f4fa20b830 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
@@ -4,7 +4,7 @@ Test SBBreakpoint APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
index dc60abfa6d0..e1d5520bcc3 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 14f69bd4e66..822b2c74392 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -13,7 +13,7 @@ after default construction.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
index 63271da276f..20333abc57a 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index a20e75794dc..e24b2ee5613 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py b/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
index 05cc38bcd58..ab2005fce90 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
@@ -4,7 +4,7 @@ Test lldb Python event APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
index c6a669ba861..96d4f51fd09 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
index 6fd5d8842f4..52aeaf848b2 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
index ba0ffabac78..13d5024bad3 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
@@ -5,7 +5,7 @@ And other SBFrame API tests.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
index 22128823764..d4cf8fe30cc 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
@@ -4,7 +4,7 @@ Testlldb Python SBFrame APIs IsInlined() and GetFunctionName().
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
index 941558d8400..c9876a8c895 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
index c47ce32d689..d45f5724f49 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
@@ -4,7 +4,7 @@ Test newly added SBSymbol and SBAddress APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
index f177315c1ad..ba2f2d46cc0 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
index 298584fe495..faff11818da 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
index 5128ac9850f..2cde05af0c3 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
@@ -4,7 +4,7 @@ Test utility functions for the frame object.
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
index 0c16bf69534..07177c1fae4 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
index cd8263e6cca..1645ae1f2a5 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -4,7 +4,7 @@ Test the iteration protocol for frame registers.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
index 6ba2b68e224..b48ded4dd36 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py b/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
index 4160fc1568b..bc97d432406 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
@@ -4,7 +4,7 @@ Test some SBModule and SBSection APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
index 2c8b2d27d80..e9b29b90e1a 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
@@ -4,7 +4,7 @@ Test SBType for ObjC classes.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
index 9284a1e5bd2..f312bc8a924 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
@@ -4,7 +4,7 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
index 783efbcfd16..2944ee78acf 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
index 04d54a06770..3b0d3fe6a30 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
index 40c73187cfe..2ff516e10d8 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
index b56f629242a..6edbbda4c11 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
index acbf672a9ec..587216468f0 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
@@ -4,7 +4,7 @@ Test SBSection APIs.
from __future__ import print_function
-import use_lldb_suite
+
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
index 42315a3a096..9825c553cce 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
@@ -4,7 +4,7 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
index a29f9f01612..2fec8dba036 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
@@ -4,7 +4,7 @@ Test SBSymbolContext APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
index 5f55daa6770..0231d285ecf 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
@@ -4,7 +4,7 @@ Test SBTarget APIs.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os, time
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
index e6535a05c15..dad829a48f2 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
@@ -4,7 +4,7 @@ Test SBThread APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py b/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
index 38b0e15d9fe..58bf5e5b988 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
@@ -4,7 +4,7 @@ Test SBType and SBTypeList API.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
index 4380f3e5874..77ff07ea648 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
@@ -4,7 +4,7 @@ Test some SBValue APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
index ce9d623e523..77aefe05be4 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
@@ -4,7 +4,7 @@ Test some SBValue APIs.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
index b96351ece32..22d7e7ebf7e 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
index 69a91901a98..251bbcf4b24 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
index 620052c6253..264e21240dd 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
index 8a7f1758016..a15e7334703 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
index 9b370253809..31545028067 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 112b0dfd6e8..f30bf856aa0 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -4,7 +4,7 @@ Test watchpoint condition API.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 048bc1de738..5a4a464657d 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index e40d1a6d34e..6facbaa8f2e 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os, time
import re
diff --git a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
index c29207bdd39..1d191249555 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
@@ -4,7 +4,7 @@ Test lldb settings command.
from __future__ import print_function
-import use_lldb_suite
+
import os, time, re
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
index 8a3a5dc73a8..878fc8a5067 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
@@ -4,7 +4,7 @@ Test quoting of arguments to lldb commands
from __future__ import print_function
-import use_lldb_suite
+
import os, time, re
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
index 7549071def7..96ed6033c30 100644
--- a/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
@@ -11,7 +11,7 @@ o test_modify_source_file_while_debugging:
from __future__ import print_function
-import use_lldb_suite
+
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
index 2f5bc5f063e..335042737d4 100644
--- a/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/test_results.py b/lldb/packages/Python/lldbsuite/test/test_results.py
index 17dcc209c4a..68f74d64036 100644
--- a/lldb/packages/Python/lldbsuite/test/test_results.py
+++ b/lldb/packages/Python/lldbsuite/test/test_results.py
@@ -10,7 +10,7 @@ within the LLDB test suite.
from __future__ import print_function
-import use_lldb_suite
+
import argparse
import inspect
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
index c5753ff2665..86a0a65b05a 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
@@ -4,7 +4,7 @@ Test that the lldb-mi driver exits properly.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
index 1c0a3b555ac..8b4eac15636 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
@@ -4,7 +4,7 @@ Test lldb-mi -file-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
index 8c7ef999a5e..7da36fe4739 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import unittest2
import lldbmi_testcase
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
index 4d35b7442a7..4d9c935576d 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
@@ -4,7 +4,7 @@ Test lldb-mi =library-loaded notifications.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
index 320dcd78c2b..d810267d948 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
index 96cb33b8b8c..a930ffebbd1 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
@@ -4,7 +4,7 @@ Test lldb-mi -break-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import lldbmi_testcase
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
index 3d372872514..068d70d9f21 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
@@ -4,7 +4,7 @@ Test lldb-mi -exec-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
index 071883ab705..df9f54110f4 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
@@ -4,7 +4,7 @@ Test lldb-mi -data-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import lldbmi_testcase
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
index 00dfdaa213e..562be912fbc 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
index d7ea122b212..f424166ad51 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
@@ -4,7 +4,7 @@ Test lldb-mi -interpreter-exec command.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
index 3c8d3d79e48..277ffe70c1c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
@@ -4,7 +4,7 @@ Base class for lldb-mi test cases.
from __future__ import print_function
-import use_lldb_suite
+
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
index 0ce4bc4665b..11e7b8a82f6 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
index b4721f98b9c..14dab38bb33 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
@@ -4,7 +4,7 @@ Test lldb-mi -stack-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
index 5687a37e0cb..8f02f1c1eca 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
@@ -4,7 +4,7 @@ Test lldb-mi startup options.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
index afc75284e3e..93044ba5ee0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
@@ -4,7 +4,7 @@ Test lldb-mi -symbol-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
index 87c7cb0a1c2..f8a6743eb16 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
index 3b516a7815c..73ef913691c 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
@@ -4,7 +4,7 @@ Test lldb-mi -target-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
index 9b9d27009ad..067df6408bd 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
index 13cf5b1edf0..f727c08e504 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
@@ -4,7 +4,7 @@ Test lldb-mi -var-xxx commands.
from __future__ import print_function
-import use_lldb_suite
+
import lldbmi_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
index 6ea2da27210..7b974e548a5 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import os
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
index 7a4fbe3f490..ca96a9a837b 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index 01b90a16be1..1ce5779e789 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index 79575711544..6535ce40475 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
index bcc6edeb1ad..b253254c78e 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index d33c6f64e04..a11167b87c2 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index 013dc4facdc..a36b4ae781a 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index 6ff14e6cf95..3b008249f55 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index d598c3a44a3..a7938795b9b 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 43a3c813e0c..cce484451de 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import sys
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
index 0a78c6f727a..579e99d6d77 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
index 3ca7cba53e0..eea99efa615 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
@@ -12,7 +12,7 @@ the initial set of tests implemented.
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import gdbremote_testcase
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
index 4ca2903257a..2b2b0e82379 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import lldbgdbserverutils
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index 2dd5054f51c..603e8ae77af 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -4,7 +4,7 @@ Base class for gdb-remote test cases.
from __future__ import print_function
-import use_lldb_suite
+
import errno
import os
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 006a534bec9..d13433252e1 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import signal
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 6226a8313b8..6618d8f75fc 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import gdbremote_testcase
import signal
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
index 86a9ee2f66f..c0ea841e2a0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
@@ -3,7 +3,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os
import os.path
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
index 1fd52bc0f26..795a8c6652d 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
@@ -1,7 +1,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import re
import select
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py
index e21191f0ee4..8b3b6b68cf0 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py
@@ -1,6 +1,6 @@
from __future__ import print_function
-import use_lldb_suite
+
import unittest2
import os.path
diff --git a/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py b/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py
index 0cc26cc3483..5818166ef5e 100644
--- a/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py
+++ b/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py
@@ -4,7 +4,7 @@ Test that variables of integer basic types are displayed correctly.
from __future__ import print_function
-import use_lldb_suite
+
import AbstractBase
import sys
diff --git a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py
index 7be19c49d66..01fd4a26780 100644
--- a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py
@@ -4,7 +4,7 @@ Test that variables of floating point types are displayed correctly.
from __future__ import print_function
-import use_lldb_suite
+
import AbstractBase
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
index 9c993f6fe63..a825a92c66c 100644
--- a/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import AbstractBase
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
index 4e52d1db9b1..4b979df51db 100644
--- a/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
@@ -4,7 +4,7 @@ Test that variables of integer basic types are displayed correctly.
from __future__ import print_function
-import use_lldb_suite
+
import AbstractBase
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
index b259809c357..c6dda91ad13 100644
--- a/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
+++ b/lldb/packages/Python/lldbsuite/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 use_lldb_suite
+
import AbstractBase
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
index a8503e9b03a..0b60b5a4d63 100644
--- a/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
@@ -4,7 +4,7 @@ Test that recursive types are handled correctly.
from __future__ import print_function
-import use_lldb_suite
+
import lldb
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py b/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py
deleted file mode 100644
index 3dbcbb91700..00000000000
--- a/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import inspect
-import os
-import sys
-
-def find_lldb_root():
- lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
- while True:
- lldb_root = os.path.dirname(lldb_root)
- if lldb_root is None:
- return None
-
- test_path = os.path.join(lldb_root, "lldb.root")
- if os.path.isfile(test_path):
- return lldb_root
- return None
-
-lldb_root = find_lldb_root()
-if lldb_root is not None:
- import imp
- module = imp.find_module("use_lldb_suite_root", [lldb_root])
- if module is not None:
- imp.load_module("use_lldb_suite_root", *module)
diff --git a/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py b/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
index ecfe3dae097..002a7aef0c7 100644
--- a/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
OpenPOWER on IntegriCloud