[Lldb-commits] [lldb] r251886 - Tighten up sys.path, and use absolute imports everywhere.

Mon Nov 2 22:02:37 PST 2015

Do you have a script you used to tweak these?

(We have a ton of stuff broken internally on this that I need to fix up).

We're starting to need to do quite a bit of extra typing for the package
structure :-/

On Mon, Nov 2, 2015 at 6:06 PM, Zachary Turner via lldb-commits <
lldb-commits at lists.llvm.org> wrote:

> Author: zturner
> Date: Mon Nov  2 20:06:18 2015
> New Revision: 251886
>
> URL: http://llvm.org/viewvc/llvm-project?rev=251886&view=rev
> Log:
> Tighten up sys.path, and use absolute imports everywhere.
>
> For convenience, we had added the folder that dotest.py was in
> to sys.path, so that we could easily write things like
> `import lldbutil` from anywhere and any test.  This introduces
> a subtle problem when using Python's package system, because when
> unittest2 imports a particular test suite, the test suite is detached
> from the package.  Thus, writing "import lldbutil" from dotest imports
> it as part of the package, and writing the same line from a test
> does a fresh import since the importing module was not part of
> the same package.
>
> The real way to fix this is to use absolute imports everywhere.  Instead
> of writing "import lldbutil", we need to write "import
> lldbsuite.test.util".  This patch fixes up that and all other similar
> cases, and additionally removes the script directory from sys.path
> to ensure that this can't happen again.
>
> Modified:
>
> lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
>
> lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
>
> lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
>
> lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
>
> lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
>
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
>     lldb/trunk/packages/Python/lldbsuite/test/dotest.py
>
> lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
>
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
>
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
>     lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
>     lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
>     lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
>     lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
>     lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
>     lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
>
> lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
>
> lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
>
> lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
>     lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
>     lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py
>
> lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
>
> lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
>
> lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
>     lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
>     lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
>
> lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
>
> lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
>     lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py
>     lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
>
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
>     lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py
>
> lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
>
> lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
>
> lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
>     lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
>     lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
>     lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
>
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
>     lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
>
> lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DefaultCacheLineSizeTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, re
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SBDirCheckerCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
> Mon Nov  2 20:06:18 2015
> @@ -5,8 +5,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, re
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import lldb
>  import subprocess
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
> Mon Nov  2 20:06:18 2015
> @@ -2,11 +2,12 @@
>
>  from __future__ import print_function
>
> +# __package__ = "lldbsuite.test"
>  import use_lldb_suite
>
>  import os, re
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import subprocess
>
>  class SBBreakpointCallbackCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ARMEmulationTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbbench import *
> -import lldbutil
> +from lldbsuite.test.lldbbench import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestBenchmarkContinue(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  def is_exe(fpath):
>      """Returns true if fpath is an executable."""
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class AttachThenDisassemblyBench(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class XCode41Vs42GDBDisassembly(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class ExpressionEvaluationCase(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class RepeatedExprsCase(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class FrameVariableResponseBench(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class StartupDelaysBench(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class RunHooksThenSteppingsBench(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class SteppingSpeedBench(BenchBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbbench import *
> +from lldbsuite.test.lldbbench import *
>
>  class CompileRunToBreakpointBench(BenchBase):
>
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Mon Nov  2
> 20:06:18 2015
> @@ -19,14 +19,10 @@ for available options.
>  """
>
>  from __future__ import print_function
> -# this module needs to have global visibility, otherwise test cases
> -# will import it anew in their local namespace, essentially losing access
> -# to all the configuration data
> -globals()['lldbtest_config'] = __import__('lldbtest_config')
> -
>  import use_lldb_suite
>
>  import lldbsuite
> +import lldbtest_config
>
>  import atexit
>  import commands
> @@ -1058,7 +1054,6 @@ def setupSysPath():
>      toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server')
>
>      # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to
> the sys.path.
> -    sys.path.insert(0, scriptPath)
>      sys.path.insert(0, pluginPath)
>      sys.path.insert(0, toolsLLDBMIPath)      # Adding test/tools/lldb-mi
> to the path makes it easy
>                                               # to "import
> lldbmi_testcase" from the MI tests
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class DriverBatchModeTest (TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandCallFunctionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandCallStopContinueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
> Mon Nov  2 20:06:18 2015
> @@ -12,8 +12,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandCallUserDefinedFunction(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandThatRestartsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandWithThrowTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCharTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>
>  class ExprSyscallTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprFormattersTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
> Mon Nov  2 20:06:18 2015
> @@ -10,8 +10,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class Issue11581TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
> Mon Nov  2 20:06:18 2015
> @@ -13,8 +13,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprOptionsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class PersistObjCPointeeType(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class PersistentPtrUpdateTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class NestedPersistentTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class PersistenttypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class PersistentVariablesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class PoVerbosityTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class Radar8638051TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class Radar9531204TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class Radar9673644TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
> Mon Nov  2 20:06:18 2015
> @@ -19,8 +19,8 @@ import unittest2
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class BasicExprCommandsTestCase(TestBase):
>
> @@ -135,7 +135,7 @@ class BasicExprCommandsTestCase(TestBase
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommands2TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprCommandWithTimeoutsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ObjCTypeQueryTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class AbbreviationsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CommonShortSpellingsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BSDArchivesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class AsanTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import json
>
>  class AsanTestReportDataCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  exe_name = "AttachResume"  # Must match Makefile
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>
>  def python_leaky_fd_version(test):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class BackticksWithNoTargetTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,10 @@ import use_lldb_suite
>
>  import os
>  import re
> -import lldb, lldbutil
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class PythonBreakpointCommandSettingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class RegexpBreakCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class BreakpointConditionsTestCase(TestBase):
>
> @@ -163,7 +164,7 @@ class BreakpointConditionsTestCase(TestB
>          self.assertTrue(process, PROCESS_IS_VALID)
>
>          # Frame #0 should be on self.line1 and the break condition should
> hold.
> -        from lldbutil import get_stopped_thread
> +        from lldbsuite.test.lldbutil import get_stopped_thread
>          thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
>          self.assertTrue(thread.IsValid(), "There should be a thread
> stopped due to breakpoint condition")
>          frame0 = thread.GetFrameAtIndex(0)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointIDTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class BreakpointIgnoreCountTestCase(TestBase):
>
> @@ -118,7 +119,7 @@ class BreakpointIgnoreCountTestCase(Test
>          # Frame#0 should be on main.c:37, frame#1 should be on main.c:25,
> and
>          # frame#2 should be on main.c:48.
>          #lldbutil.print_stacktraces(process)
> -        from lldbutil import get_stopped_thread
> +        from lldbsuite.test.lldbutil import get_stopped_thread
>          thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
>          self.assertTrue(thread.IsValid(), "There should be a thread
> stopped due to breakpoint")
>          frame0 = thread.GetFrameAtIndex(0)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointLocationsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointOptionsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import shutil
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,9 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import unittest2
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ConsecutiveBreakpoitsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCPPBreakpointLocations(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,10 @@ import use_lldb_suite
>
>  import os
>  import re
> -import lldb, lldbutil
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestCPPExceptionBreakpoint (TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointInDummyTarget (TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class InlinedBreakpointsTestCase(TestBase):
>      """Bug fixed: rdar://problem/8464339"""
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import shutil
>  import subprocess
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CommandHistoryTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CommandRegexTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CmdPythonTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ImportTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class Rdar12586188TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
> Mon Nov  2 20:06:18 2015
> @@ -10,7 +10,7 @@ import use_lldb_suite
>
>  import os, sys
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CommandSourceTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CommandLineCompletionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  # rdar://problem/8532131
>  # lldb not able to digest the clang-generated debug info correctly with
> respect to function name
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterBoolRefPtr(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CompactVectorsFormattingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class AdvDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CategoriesDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CppDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterDisablingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class EnumFormatTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class GlobalsDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NamedSummariesDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
> Mon Nov  2 20:06:18 2015
> @@ -9,9 +9,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ObjCDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
> Mon Nov  2 20:06:18 2015
> @@ -9,9 +9,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NSStringDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterOneIsSingularTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class PtrToArrayDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class PythonSynthDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ScriptDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SkipSummaryDataFormatterTestCase(TestBase):
>
> @@ -32,7 +32,7 @@ class SkipSummaryDataFormatterTestCase(T
>          """Test that that file and class static variables display
> correctly."""
>          self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
>
> -        #import lldbutil
> +        #import lldbsuite.test.lldbutil as lldbutil
>          lldbutil.run_break_set_by_file_and_line (self, "main.cpp",
> self.line, num_expected_locations=1, loc_exact=True)
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SmartArrayDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class InitializerListTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxIteratorDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time, re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxListDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time, re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxListDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxMapDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxMultiMapDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxMultiSetDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxSetDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxStringDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxUnorderedDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxVBoolDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LibcxxVectorDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdIteratorDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdListDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdMapDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdStringDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdVBoolDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdVectorDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SynthDataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterSynthValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
> Mon Nov  2 20:06:18 2015
> @@ -1,3 +1,3 @@
> -import lldbinline
> +import lldbsuite.test.lldbinline as lldbinline
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbinline.expectedFailureWindows("llvm.org/pr24663")])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class FormatPropagationTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class FrameFormatSmallStructTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterHexCapsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NSArraySyntheticTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NSDictionarySyntheticTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NSSetSyntheticTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterOSTypeTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class PtrRef2TypedefTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DataFormatterRefPtrRecursionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.expectedFailureWindows("llvm.org/pr24772")])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class Radar9974002DataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SyntheticCappingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SyntheticFilterRecomputingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.expectedFailureGcc])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class UserFormatVSSummaryTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class VarInAggregateMisuseTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import os.path
>
>  class PythonSynthDataFormatterTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class VectorTypesFormattingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DeadStripTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class DisassemblyTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class DynamicValueChildCountTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ConvenienceVariablesCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
> Mon Nov  2 20:06:18 2015
> @@ -5,16 +5,16 @@ from __future__ import print_function
>
>  import use_lldb_suite
>
> -import commands
>  import lldb
> +import commands
>  import os
>  import time
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  def execute_command (command):
>      #print('%% %s' % (command))
> -    (exit_status, output) = commands.getstatusoutput (command)
> +    (exit_status, output) = commands.getstatusoutput(command)
>      #if output:
>      #    print(output)
>      #print('status = %u' % (exit_status))
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ExprDoesntDeadlockTestCase(TestBase):
>
> @@ -45,7 +46,7 @@ class ExprDoesntDeadlockTestCase(TestBas
>          self.assertTrue(process, PROCESS_IS_VALID)
>
>          # Frame #0 should be on self.line1 and the break condition should
> hold.
> -        from lldbutil import get_stopped_thread
> +        from lldbsuite.test.lldbutil import get_stopped_thread
>          thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
>          self.assertTrue(thread.IsValid(), "There should be a thread
> stopped due to breakpoint condition")
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
> Mon Nov  2 20:06:18 2015
> @@ -5,16 +5,16 @@ from __future__ import print_function
>
>  import use_lldb_suite
>
> -import commands
>  import lldb
> +import commands
>  import os
>  import time
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  def execute_command (command):
>      # print('%% %s' % (command))
> -    (exit_status, output) = commands.getstatusoutput (command)
> +    (exit_status, output) = commands.getstatusoutput(command)
>      # if output:
>      #     print(output)
>      # print('status = %u' % (exit_status))
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestFormats(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
> Mon Nov  2 20:06:18 2015
> @@ -5,8 +5,10 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, time
> -import lldb, lldbutil, lldbplatformutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +import lldbsuite.test.lldbplatformutil as lldbplatformutil
> +from lldbsuite.test.lldbtest import *
>
>  class AssertingInferiorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ChangedInferiorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
> Mon Nov  2 20:06:18 2015
> @@ -5,8 +5,10 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, time
> -import lldb, lldbutil, lldbplatformutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +import lldbsuite.test.lldbplatformutil as lldbplatformutil
> +from lldbsuite.test.lldbtest import *
>
>  class CrashingInferiorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
> Mon Nov  2 20:06:18 2015
> @@ -5,9 +5,10 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, time
> -import lldb, lldbutil, lldbplatformutil
> -import sys
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +import lldbsuite.test.lldbplatformutil as lldbplatformutil
> +from lldbsuite.test.lldbtest import *
>
>  class CrashingRecursiveInferiorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time, sys
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestInlineStepping(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import re
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>  import lldb
>  import os
>  import time
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LaunchWithShellExpandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipIfWindows # Windows doesn't have dlopen and friends, dynamic
> libraries work differently
>  class LoadUnloadTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class LongjmpTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class MemoryReadTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NonOverlappingIndexVariableCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NoSuchArchTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
> Mon Nov  2 20:06:18 2015
> @@ -10,8 +10,8 @@ import use_lldb_suite
>
>  import os.path
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import re
>
>  class TestImageListMultiArchitecture(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>  import lldb
>  import os
>  import time
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestPaths(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class PlatformCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class PluginCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class PluginPythonOSPlugin(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessWindows  # for now mini-dump debugging is limited to Windows
> hosts
>  class MiniDumpTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  exe_name = "ProcessAttach"  # Must match Makefile
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import os
>  import time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  exe_name = 'AttachDenied'  # Must match Makefile
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>
>  class ChangeProcessGroupTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ProcessLaunchTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ValueObjectRecursionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, sys, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class RegisterCommandsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>  import lldb
>  import os
>  import time
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestRerun(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ReturnValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SetDataTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time, signal
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>
>  class SendSignalTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import re
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import re
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class SingleQuoteInCommandLineTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,10 @@ import use_lldb_suite
>
>  import os
>  import re
> -import lldb, lldbutil
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ReturnValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StopHookCmdTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class StopHookMechanismTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class StopHookForMultipleThreadsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import lldb
>  import sys
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class targetCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NumberOfThreadsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BreakpointAfterJoinTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
> Mon Nov  2 20:06:18 2015
> @@ -17,8 +17,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipIfWindows
>  class ConcurrentEventsTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CreateDuringStepTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CreateAfterAttachTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CreateDuringStepTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ExitDuringBreakpointTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ExitDuringStepTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ThreadJumpTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class MultipleBreakpointTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ThreadStateTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ThreadStepOutTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ThreadExitTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ThreadSpecificBreakTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class LaunchInTerminalTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TypeCompletionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  import datetime
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TypeLookupTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NoreturnUnwind(TestBase):
>      mydir = TestBase.compute_mydir(__file__)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SigtrampUnwind(TestBase):
>      mydir = TestBase.compute_mydir(__file__)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
> Mon Nov  2 20:06:18 2015
> @@ -17,8 +17,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  test_source_dirs = ["."]
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ValueMD5CrashTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class HelloWatchLocationTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class HelloWatchpointTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointForMultipleThreadsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -5,8 +5,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>
>  class TestStepOverWatchpoint(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchedVariableHitWhenInScopeTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointCommandsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointLLDBCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointPythonCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointConditionCmdTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestWatchpointEvents (TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestValueOfVectorVariableTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchLocationUsingWatchpointSetTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class WatchpointSetErrorTestCase(TestBase):
>
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py Mon Nov  2
> 20:06:18 2015
> @@ -10,7 +10,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class HelpCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class AnonymousTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ArrayTypesTestCase(TestBase):
>
> @@ -102,7 +102,7 @@ class ArrayTypesTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
> @@ -187,7 +187,7 @@ class ArrayTypesTestCase(TestBase):
>
>          # Last, check that "long_6" has a value type of
> eValueTypeVariableLocal
>          # and "argc" has eValueTypeVariableArgument.
> -        from lldbutil import value_type_to_str
> +        from lldbsuite.test.lldbutil import value_type_to_str
>          self.assertTrue(variable.GetValueType() ==
> lldb.eValueTypeVariableLocal,
>                          "Variable 'long_6' should have '%s' value type." %
>                          value_type_to_str(lldb.eValueTypeVariableLocal))
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BitfieldsTestCase(TestBase):
>
> @@ -114,7 +114,7 @@ class BitfieldsTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = target.GetProcess().GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BlocksTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ConstVariableTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class EnumTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ForwardDeclarationTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class FunctionTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class GlobalVariablesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
> Mon Nov  2 20:06:18 2015
> @@ -7,11 +7,11 @@ import use_lldb_suite
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CModulesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class RegisterVariableTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SetValuesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import unittest2
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SharedLibTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import unittest2
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SharedLibStrippedTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestCStepping(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
> Mon Nov  2 20:06:18 2015
> @@ -8,9 +8,10 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> -import lldbutil
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ThreadSteppingTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests that C strings work as expected in expressions
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CStringsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.expectedFailureWindows("llvm.org/pr24764")] )
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TlsGlobalTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py Mon
> Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TypedefTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests that bool types work
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPBoolTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CPPBreakpointCommandsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@ Tests calling a function by basename
>  """
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CallCPPFunctionTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
> Mon Nov  2 20:06:18 2015
> @@ -1,6 +1,6 @@
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCppChainedCalls(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class Char1632TestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StaticVariableTestCase(TestBase):
>
> @@ -71,7 +71,7 @@ class StaticVariableTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,9 +6,9 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ClassTypesTestCase(TestBase):
>
> @@ -94,7 +94,7 @@ class ClassTypesTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
> @@ -205,7 +205,7 @@ class ClassTypesTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class IterateFrameAndDisassembleTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests that bool types work
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPTestDiamondInheritance(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,9 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class CppValueCastTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class DynamicValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPP11EnumTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class CPPBreakpointTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Test that global operators are found and evaluated.
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCppGlobalOperators(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -1,6 +1,6 @@
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCppIncompleteTypes(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
> Mon Nov  2 20:06:18 2015
> @@ -1,6 +1,6 @@
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestWithLimitDebugInfo(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class NamespaceTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests imported namespaces in C++.
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCppNsImport(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@ Tests that functions with the same name
>  """
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPStaticMethodsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
> Mon Nov  2 20:06:18 2015
> @@ -10,8 +10,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  # this test case fails because of rdar://12991846
>  # the expression parser does not deal correctly with Unicode expressions
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@ Tests that rvalue references are support
>  """
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class RvalueReferencesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Test scopes in C++.
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestCppScopes(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class UnsignedTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import unittest2
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPStaticMembersTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@ Tests expressions that distinguish betwe
>  """
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPStaticMethodsTestCase(TestBase):
>
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py Mon
> Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class STLTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class StdCXXDisassembleTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests that C++ member and static variables are available where they
> should be.
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CPPThisTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class UniqueTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class UnsignedTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  def Msg(expr, val):
>      return "'expression %s' matches the output (from compiled code): %s"
> % (expr, val)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CxxWCharTTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py
> Mon Nov  2 20:06:18 2015
> @@ -3,8 +3,8 @@
>  import os, time
>  import unittest2
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestGoUserExpression(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestGoASTContext(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestGoASTContext(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, time, re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MixedLanguagesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestObjCIvarsInBlocks(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ForwardDeclTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ConstStringTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class FoundationDisassembleTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
> Mon Nov  2 20:06:18 2015
> @@ -10,8 +10,8 @@ import use_lldb_suite
>  import os, os.path, time
>  import lldb
>  import string
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  file_index = 0
>  @skipUnlessDarwin
> @@ -195,7 +195,7 @@ class FoundationTestCase(TestBase):
>          # The stop reason of the thread should be breakpoint.
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class FoundationTestCase2(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjectDescriptionAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class RuntimeTypesTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  @skipUnlessDarwin
>  class FoundationSymtabTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import subprocess
>
>  class HiddenIvarsTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
> Mon Nov  2 20:06:18 2015
> @@ -7,14 +7,15 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import os, time
> -import re
> -import lldb, lldbutil
> -from lldbtest import *
>  import commands
> +import re
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  def execute_command (command):
>      # print('%% %s' % (command))
> -    (exit_status, output) = commands.getstatusoutput (command)
> +    (exit_status, output) = commands.getstatusoutput(command)
>      # if output:
>      #     print(output)
>      # print('status = %u' % (exit_status))
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
> Mon Nov  2 20:06:18 2015
> @@ -8,11 +8,11 @@ import unittest2
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCModulesAutoImportTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
> Mon Nov  2 20:06:18 2015
> @@ -8,11 +8,11 @@ import unittest2
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class IncompleteModulesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
> Mon Nov  2 20:06:18 2015
> @@ -8,11 +8,11 @@ import unittest2
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ModulesInlineFunctionsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
> Mon Nov  2 20:06:18 2015
> @@ -8,11 +8,11 @@ import unittest2
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCModulesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc%2B%2B/TestObjCXX.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ObjCXXTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCDynamicValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCBuiltinTypes(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCCheckerTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCClassMethod(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class ObjCDynamicSBTypeTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCDynamicValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestObjCIvarOffsets(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestObjCIvarStripped(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
> Mon Nov  2 20:06:18 2015
> @@ -8,11 +8,11 @@ import unittest2
>  import os, time
>  import lldb
>  import platform
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  from distutils.version import StrictVersion
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCNewSyntaxTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
> Mon Nov  2 20:06:18 2015
> @@ -13,8 +13,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import re
>
>  # rdar://problem/9087739
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCPropertyTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCStaticMethodStripped(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCStaticMethod(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCStepping(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCStructArgument(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCClassMethod(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestObjCSuperMethod(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  @skipUnlessDarwin
>  class PrintObjTestCase(TestBase):
> @@ -51,7 +51,7 @@ class PrintObjTestCase(TestBase):
>
>          # Let's get the current stopped thread.  We'd like to switch to
> the
>          # other thread to issue our 'po lock_me' command.
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          this_thread = lldbutil.get_stopped_thread(process,
> lldb.eStopReasonBreakpoint)
>          self.assertTrue(this_thread)
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class MethodReturningBOOLTestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class Rdar10967107TestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class Rdar10967107TestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  @skipUnlessDarwin
>  class Rdar12408181TestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class TestRealDefinition(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
> Mon Nov  2 20:06:18 2015
> @@ -2,8 +2,8 @@
>  Tests that ObjC member variables are available where they should be.
>  """
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ObjCSelfTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class BuiltinTrapTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class CreateDuringInstructionStepTestCase(TestBase):
>
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Mon Nov  2
> 20:06:18 2015
> @@ -48,7 +48,7 @@ import types
>  import unittest2
>  import lldb
>  import lldbtest_config
> -import lldbutil
> +import  lldbutil
>  import test_categories
>
>  from six import add_metaclass
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py Mon
> Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time, string
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class LogTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ import use_lldb_suite
>  import os, time
>  import lldb
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  @skipUnlessDarwin
>  class AddDsymMidExecutionCommandCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -from lldbutil import symbol_type_to_str
> +from lldbsuite.test.lldbtest import *
> +from lldbsuite.test.lldbutil import symbol_type_to_str
>
>  class AppleTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestIndirectFunctions(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py Mon
> Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class OrderFileTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestQueues(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TestSafeFuncCalls(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
> Mon Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class UniversalTestCase(TestBase):
>
> @@ -45,7 +45,7 @@ class UniversalTestCase(TestBase):
>              "requires i386 or x86_64")
>      def test_process_launch_for_universal(self):
>          """Test process launch of a universal binary."""
> -        from lldbutil import print_registers
> +        from lldbsuite.test.lldbutil import print_registers
>
>          # Invoke the default build rule.
>          self.build()
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py Mon
> Nov  2 20:06:18 2015
> @@ -14,7 +14,7 @@ variable.
>
>  import os, sys
>  import platform
> -import lldbtest
> +import lldbsuite.test.lldbtest as lldbtest
>
>  def getArchitecture():
>      """Returns the architecture in effect the test suite is running
> with."""
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py
> Mon Nov  2 20:06:18 2015
> @@ -1,7 +1,7 @@
>
>  from __future__ import print_function
>  import os
> -import lldbtest
> +import lldbsuite.test.lldbtest as lldbtest
>
>  from builder_base import *
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class BreakpointAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class SBTypeMemberFunctionsTest(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -4,7 +4,7 @@ Test Debugger APIs.
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>
>  class DebuggerAPITestCase(TestBase):
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
> Mon Nov  2 20:06:18 2015
> @@ -17,8 +17,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class APIDefaultConstructorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class DisassembleRawDataTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class Disassemble_VST1_64(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class EventAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SBFrameFindValueTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SBFormattersAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class FrameAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class InlinedFrameAPITestCase(TestBase):
>
> @@ -47,7 +48,7 @@ class InlinedFrameAPITestCase(TestBase):
>          self.assertTrue(process.GetState() == lldb.eStateStopped,
>                          PROCESS_STOPPED)
>
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          stack_traces1 = lldbutil.print_stacktraces(process,
> string_buffer=True)
>          if self.TraceOn():
>              print("Full stack traces when first stopped on the breakpoint
> 'inner_inline':")
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class DisasmAPITestCase(TestBase):
>
> @@ -103,7 +104,7 @@ class DisasmAPITestCase(TestBase):
>          self.assertTrue(sa1 and sa2 and sa1 == sa2,
>                          "The two starting addresses should be the same")
>
> -        from lldbutil import get_description
> +        from lldbsuite.test.lldbutil import get_description
>          desc1 = get_description(sa1)
>          desc2 = get_description(sa2)
>          self.assertTrue(desc1 and desc2 and desc1 == desc2,
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class SymbolAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ import use_lldb_suite
>  import os, sys, time
>  import lldb
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class HelloWorldTestCase(TestBase):
>
> @@ -65,7 +65,7 @@ class HelloWorldTestCase(TestBase):
>
>          thread = process.GetThreadAtIndex(0)
>          if thread.GetStopReason() != lldb.eStopReasonBreakpoint:
> -            from lldbutil import stop_reason_to_str
> +            from lldbsuite.test.lldbutil import stop_reason_to_str
>              self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %
>                        stop_reason_to_str(thread.GetStopReason()))
>
> @@ -95,7 +95,7 @@ class HelloWorldTestCase(TestBase):
>          self.assertTrue(error.Success() and process, PROCESS_IS_VALID)
>
>          # Let's check the stack traces of the attached process.
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          stacktraces = lldbutil.print_stacktraces(process,
> string_buffer=True)
>          self.expect(stacktraces, exe=False,
>              substrs = ['main.c:%d' % self.line2,
> @@ -137,7 +137,7 @@ class HelloWorldTestCase(TestBase):
>              startstr = name)
>
>          # Let's check the stack traces of the attached process.
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          stacktraces = lldbutil.print_stacktraces(process,
> string_buffer=True)
>          self.expect(stacktraces, exe=False,
>              substrs = ['main.c:%d' % self.line2,
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class CommandInterpreterAPICase(TestBase):
>
> @@ -63,7 +63,7 @@ class CommandInterpreterAPICase(TestBase
>          process = ci.GetProcess()
>          self.assertTrue(process)
>
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          if process.GetState() != lldb.eStateStopped:
>              self.fail("Process should be in the 'stopped' state, "
>                        "instead the actual state is: '%s'" %
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class FrameUtilsTestCase(TestBase):
>
> @@ -41,7 +41,7 @@ class FrameUtilsTestCase(TestBase):
>          self.assertTrue(process.GetState() == lldb.eStateStopped,
>                          PROCESS_STOPPED)
>
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          thread = lldbutil.get_stopped_thread(process,
> lldb.eStopReasonBreakpoint)
>          self.assertTrue (thread)
>          frame0 = thread.GetFrameAtIndex(0)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class LLDBIteratorTestCase(TestBase):
>
> @@ -40,7 +40,7 @@ class LLDBIteratorTestCase(TestBase):
>          if not process:
>              self.fail("SBTarget.LaunchProcess() failed")
>
> -        from lldbutil import get_description
> +        from lldbsuite.test.lldbutil import get_description
>          yours = []
>          for i in range(target.GetNumModules()):
>              yours.append(target.GetModuleAtIndex(i))
> @@ -72,7 +72,7 @@ class LLDBIteratorTestCase(TestBase):
>
>          self.assertTrue(target.GetNumBreakpoints() == 2)
>
> -        from lldbutil import get_description
> +        from lldbsuite.test.lldbutil import get_description
>          yours = []
>          for i in range(target.GetNumBreakpoints()):
>              yours.append(target.GetBreakpointAtIndex(i))
> @@ -106,7 +106,7 @@ class LLDBIteratorTestCase(TestBase):
>          if not process:
>              self.fail("SBTarget.LaunchProcess() failed")
>
> -        from lldbutil import print_stacktrace
> +        from lldbsuite.test.lldbutil import print_stacktrace
>          stopped_due_to_breakpoint = False
>          for thread in process:
>              if self.TraceOn():
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class RegistersIteratorTestCase(TestBase):
>
> @@ -40,7 +40,7 @@ class RegistersIteratorTestCase(TestBase
>          if not process:
>              self.fail("SBTarget.LaunchProcess() failed")
>
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          for thread in process:
>              if thread.GetStopReason() == lldb.eStopReasonBreakpoint:
>                  for frame in thread:
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class ThreadsStackTracesTestCase(TestBase):
>
> @@ -41,7 +41,7 @@ class ThreadsStackTracesTestCase(TestBas
>          if not process:
>              self.fail("SBTarget.LaunchProcess() failed")
>
> -        import lldbutil
> +        import lldbsuite.test.lldbutil as lldbutil
>          if process.GetState() != lldb.eStateStopped:
>              self.fail("Process should be in the 'stopped' state, "
>                        "instead the actual state is: '%s'" %
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,8 @@ import use_lldb_suite
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -from lldbutil import symbol_type_to_str
> +from lldbsuite.test.lldbtest import *
> +from lldbsuite.test.lldbutil import symbol_type_to_str
>
>  class ModuleAndSectionAPIsTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ObjCSBTypeTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbutil import get_stopped_thread, state_type_to_str
> -from lldbtest import *
> +from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str
> +from lldbsuite.test.lldbtest import *
>
>  class ProcessAPITestCase(TestBase):
>
> @@ -187,7 +187,7 @@ class ProcessAPITestCase(TestBase):
>          location = int(val.GetLocation(), 16)
>
>          # Note that the canonical from of the bytearray is little endian.
> -        from lldbutil import int_to_bytearray, bytearray_to_int
> +        from lldbsuite.test.lldbutil import int_to_bytearray,
> bytearray_to_int
>
>          byteSize = val.GetByteSize()
>          bytes = int_to_bytearray(256, byteSize)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class ProcessIOTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class Radar12481949DataFormatterTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
> Mon Nov  2 20:06:18 2015
> @@ -6,9 +6,9 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  from math import fabs
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SBDataAPICase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
> Mon Nov  2 20:06:18 2015
> @@ -1,4 +1,4 @@
> -import lldbinline
> -import lldbtest
> +import lldbsuite.test.lldbinline as lldbinline
> +import lldbsuite.test.lldbtest as lldbtest
>
>  lldbinline.MakeInlineTest(__file__, globals(),
> [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
> Mon Nov  2 20:06:18 2015
> @@ -1,3 +1,3 @@
> -import lldbinline
> +import lldbsuite.test.lldbinline as lldbinline
>
>  lldbinline.MakeInlineTest(__file__, globals())
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
> Mon Nov  2 20:06:18 2015
> @@ -6,8 +6,8 @@ import use_lldb_suite
>
>  import os, sys, time
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SBValuePersistTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ from __future__ import print_function
>
>  import use_lldb_suite
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class SectionAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbutil import get_stopped_thread, state_type_to_str
> -from lldbtest import *
> +from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str
> +from lldbsuite.test.lldbtest import *
>
>  class SignalsAPITestCase(TestBase):
>      mydir = TestBase.compute_mydir(__file__)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class SymbolContextAPITestCase(TestBase):
>
> @@ -44,7 +45,7 @@ class SymbolContextAPITestCase(TestBase)
>          self.assertTrue(process, PROCESS_IS_VALID)
>
>          # Frame #0 should be on self.line.
> -        from lldbutil import get_stopped_thread
> +        from lldbsuite.test.lldbutil import get_stopped_thread
>          thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
>          self.assertTrue(thread.IsValid(), "There should be a thread
> stopped due to breakpoint")
>          frame0 = thread.GetFrameAtIndex(0)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,9 @@ import use_lldb_suite
>  import unittest2
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TargetAPITestCase(TestBase):
>
> @@ -233,7 +234,7 @@ class TargetAPITestCase(TestBase):
>          target = self.dbg.CreateTarget(exe)
>          self.assertTrue(target, VALID_TARGET)
>
> -        from lldbutil import get_description
> +        from lldbsuite.test.lldbutil import get_description
>
>          # get_description() allows no option to mean
> lldb.eDescriptionLevelBrief.
>          desc = get_description(target)
> @@ -364,7 +365,7 @@ class TargetAPITestCase(TestBase):
>          #print("symbol1:", symbol1)
>          #print("symbol2:", symbol2)
>
> -        from lldbutil import get_description
> +        from lldbsuite.test.lldbutil import get_description
>          desc1 = get_description(symbol1)
>          desc2 = get_description(symbol2)
>          self.assertTrue(desc1 and desc2 and desc1 == desc2,
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbutil import get_stopped_thread, get_caller_symbol
> -from lldbtest import *
> +from lldbsuite.test.lldbutil import get_stopped_thread, get_caller_symbol
> +from lldbsuite.test.lldbtest import *
>
>  class ThreadAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TypeAndTypeListTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ValueAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ChangeValueAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
> Mon Nov  2 20:06:18 2015
> @@ -9,8 +9,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class ValueAsLinkedListTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ import use_lldb_suite
>  import os, sys, time
>  import lldb
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class HelloWorldTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class SetWatchpointAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class WatchpointIgnoreCountTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class WatchpointIteratorTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -import lldbutil
> -from lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class WatchpointConditionAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class SetWatchlocationAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,9 @@ import use_lldb_suite
>
>  import os, time
>  import re
> -import lldb, lldbutil
> -from lldbtest import *
> +import lldb
> +import lldbsuite.test.lldbutil as lldbutil
> +from lldbsuite.test.lldbtest import *
>
>  class TargetWatchAddressAPITestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py Mon
> Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time, re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class SettingsCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os, time, re
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class SettingsCommandTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
> Mon Nov  2 20:06:18 2015
> @@ -14,8 +14,8 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  class SourceManagerTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestSTTYBeforeAndAfter(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiExitTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiFileTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import unittest2
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py Mon
> Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import unittest2
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiExecTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import use_lldb_suite
>
>  import unittest2
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiDataTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ from __future__ import print_function
>
>  import use_lldb_suite
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiTestCaseBase(Base):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiStackTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiTargetTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
> Mon Nov  2 20:06:18 2015
> @@ -7,7 +7,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldbmi_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class MiVarTestCase(lldbmi_testcase.MiTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
> Mon Nov  2 20:06:18 2015
> @@ -8,8 +8,8 @@ import use_lldb_suite
>
>  import os
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>  import binascii
>
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
> Mon Nov  2 20:06:18 2015
> @@ -5,7 +5,7 @@ import use_lldb_suite
>  import gdbremote_testcase
>  import lldbgdbserverutils
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class
> TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
> Mon Nov  2 20:06:18 2015
> @@ -5,7 +5,7 @@ import use_lldb_suite
>  import gdbremote_testcase
>  import lldbgdbserverutils
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import gdbremote_testcase
>  import lldbgdbserverutils
>  import sys
>
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class
> TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase):
>      """Test QSaveRegisterState/QRestoreRegisterState support."""
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class
> TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import sys
>
>  import unittest2
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class
> TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
> Mon Nov  2 20:06:18 2015
> @@ -3,7 +3,7 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import gdbremote_testcase
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
> Mon Nov  2 20:06:18 2015
> @@ -19,7 +19,7 @@ import gdbremote_testcase
>  import lldbgdbserverutils
>  import platform
>  import signal
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import re
>  import select
>  import socket
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
> Mon Nov  2 20:06:18 2015
> @@ -8,7 +8,7 @@ import os
>  import select
>  import tempfile
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
> Mon Nov  2 20:06:18 2015
> @@ -20,7 +20,7 @@ import subprocess
>  import sys
>  import tempfile
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>  from lldbgdbserverutils import *
>  import logging
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
> Mon Nov  2 20:06:18 2015
> @@ -4,7 +4,7 @@ import use_lldb_suite
>
>  import gdbremote_testcase
>  import signal
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteAbort(gdbremote_testcase.GdbRemoteTestCaseBase):
>      mydir = TestBase.compute_mydir(__file__)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
> Mon Nov  2 20:06:18 2015
> @@ -4,7 +4,7 @@ import use_lldb_suite
>
>  import gdbremote_testcase
>  import signal
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class TestGdbRemoteSegFault(gdbremote_testcase.GdbRemoteTestCaseBase):
>      mydir = TestBase.compute_mydir(__file__)
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
> Mon Nov  2 20:06:18 2015
> @@ -13,7 +13,7 @@ import six
>  import socket_packet_pump
>  import subprocess
>  import time
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  from six.moves import queue
>
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py Mon
> Nov  2 20:06:18 2015
> @@ -7,8 +7,8 @@ from __future__ import print_function
>  import os, time
>  import re
>  import lldb
> -from lldbtest import *
> -import lldbutil
> +from lldbsuite.test.lldbtest import *
> +import lldbsuite.test.lldbutil as lldbutil
>
>  def Msg(var, val, using_frame_variable):
>      return "'%s %s' matches the output (from compiled code): %s" % (
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import AbstractBase
>  import sys
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  # rdar://problem/9649573
>  # Capture the lldb and gdb-remote log files for test failures when run
> with no "-w" option
>
> Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py Mon
> Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import AbstractBase
>  import lldb
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class FloatTypesTestCase(AbstractBase.GenericTester):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import AbstractBase
>  import lldb
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class FloatTypesExprTestCase(AbstractBase.GenericTester):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import AbstractBase
>  import lldb
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class IntegerTypesTestCase(AbstractBase.GenericTester):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py Mon
> Nov  2 20:06:18 2015
> @@ -9,7 +9,7 @@ import use_lldb_suite
>  import AbstractBase
>  import lldb
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class IntegerTypesExprTestCase(AbstractBase.GenericTester):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> --- lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
> (original)
> +++ lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
> Mon Nov  2 20:06:18 2015
> @@ -7,9 +7,9 @@ from __future__ import print_function
>  import use_lldb_suite
>
>  import lldb
> -import lldbutil
> +import lldbsuite.test.lldbutil as lldbutil
>  import sys
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  class RecursiveTypesTestCase(TestBase):
>
>
> Modified:
> lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py?rev=251886&r1=251885&r2=251886&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
> (original)
> +++
> lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
> Mon Nov  2 20:06:18 2015
> @@ -6,7 +6,7 @@ import use_lldb_suite
>
>  import os, time
>  import lldb
> -from lldbtest import *
> +from lldbsuite.test.lldbtest import *
>
>  @skipUnlessDarwin
>  class AddDsymCommandCase(TestBase):
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
>

-- 
-Todd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20151102/f523ac59/attachment-0001.html>