<div dir="ltr">Do you have a script you used to tweak these?<div><br></div><div>(We have a ton of stuff broken internally on this that I need to fix up).</div><div><br></div><div>We're starting to need to do quite a bit of extra typing for the package structure :-/</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 2, 2015 at 6:06 PM, Zachary Turner via lldb-commits <span dir="ltr"><<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: zturner<br>
Date: Mon Nov  2 20:06:18 2015<br>
New Revision: 251886<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=251886&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=251886&view=rev</a><br>
Log:<br>
Tighten up sys.path, and use absolute imports everywhere.<br>
<br>
For convenience, we had added the folder that dotest.py was in<br>
to sys.path, so that we could easily write things like<br>
`import lldbutil` from anywhere and any test.  This introduces<br>
a subtle problem when using Python's package system, because when<br>
unittest2 imports a particular test suite, the test suite is detached<br>
from the package.  Thus, writing "import lldbutil" from dotest imports<br>
it as part of the package, and writing the same line from a test<br>
does a fresh import since the importing module was not part of<br>
the same package.<br>
<br>
The real way to fix this is to use absolute imports everywhere.  Instead<br>
of writing "import lldbutil", we need to write "import<br>
lldbsuite.test.util".  This patch fixes up that and all other similar<br>
cases, and additionally removes the script directory from sys.path<br>
to ensure that this can't happen again.<br>
<br>
Modified:<br>
    lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/dotest.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py<br>
    lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DefaultCacheLineSizeTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, re<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SBDirCheckerCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py Mon Nov  2 20:06:18 2015<br>
@@ -5,8 +5,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, re<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import lldb<br>
 import subprocess<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py Mon Nov  2 20:06:18 2015<br>
@@ -2,11 +2,12 @@<br>
<br>
 from __future__ import print_function<br>
<br>
+# __package__ = "lldbsuite.test"<br>
 import use_lldb_suite<br>
<br>
 import os, re<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import subprocess<br>
<br>
 class SBBreakpointCallbackCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ARMEmulationTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbbench import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbbench import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestBenchmarkContinue(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 def is_exe(fpath):<br>
     """Returns true if fpath is an executable."""<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class AttachThenDisassemblyBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class XCode41Vs42GDBDisassembly(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class ExpressionEvaluationCase(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class RepeatedExprsCase(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class FrameVariableResponseBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class StartupDelaysBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class RunHooksThenSteppingsBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class SteppingSpeedBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbbench import *<br>
+from lldbsuite.test.lldbbench import *<br>
<br>
 class CompileRunToBreakpointBench(BenchBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Mon Nov  2 20:06:18 2015<br>
@@ -19,14 +19,10 @@ for available options.<br>
 """<br>
<br>
 from __future__ import print_function<br>
-# this module needs to have global visibility, otherwise test cases<br>
-# will import it anew in their local namespace, essentially losing access<br>
-# to all the configuration data<br>
-globals()['lldbtest_config'] = __import__('lldbtest_config')<br>
-<br>
 import use_lldb_suite<br>
<br>
 import lldbsuite<br>
+import lldbtest_config<br>
<br>
 import atexit<br>
 import commands<br>
@@ -1058,7 +1054,6 @@ def setupSysPath():<br>
     toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server')<br>
<br>
     # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to the sys.path.<br>
-    sys.path.insert(0, scriptPath)<br>
     sys.path.insert(0, pluginPath)<br>
     sys.path.insert(0, toolsLLDBMIPath)      # Adding test/tools/lldb-mi to the path makes it easy<br>
                                              # to "import lldbmi_testcase" from the MI tests<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class DriverBatchModeTest (TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandCallFunctionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandCallStopContinueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py Mon Nov  2 20:06:18 2015<br>
@@ -12,8 +12,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandCallUserDefinedFunction(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandThatRestartsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandWithThrowTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCharTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
<br>
 class ExprSyscallTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprFormattersTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py Mon Nov  2 20:06:18 2015<br>
@@ -10,8 +10,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class Issue11581TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py Mon Nov  2 20:06:18 2015<br>
@@ -13,8 +13,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprOptionsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PersistObjCPointeeType(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PersistentPtrUpdateTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class NestedPersistentTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PersistenttypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PersistentVariablesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PoVerbosityTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class Radar8638051TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class Radar9531204TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class Radar9673644TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py Mon Nov  2 20:06:18 2015<br>
@@ -19,8 +19,8 @@ import unittest2<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class BasicExprCommandsTestCase(TestBase):<br>
<br>
@@ -135,7 +135,7 @@ class BasicExprCommandsTestCase(TestBase<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommands2TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprCommandWithTimeoutsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ObjCTypeQueryTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class AbbreviationsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CommonShortSpellingsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BSDArchivesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class AsanTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import json<br>
<br>
 class AsanTestReportDataCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 exe_name = "AttachResume"  # Must match Makefile<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
<br>
 def python_leaky_fd_version(test):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class BackticksWithNoTargetTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,10 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import re<br>
-import lldb, lldbutil<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PythonBreakpointCommandSettingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class RegexpBreakCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class BreakpointConditionsTestCase(TestBase):<br>
<br>
@@ -163,7 +164,7 @@ class BreakpointConditionsTestCase(TestB<br>
         self.assertTrue(process, PROCESS_IS_VALID)<br>
<br>
         # Frame #0 should be on self.line1 and the break condition should hold.<br>
-        from lldbutil import get_stopped_thread<br>
+        from lldbsuite.test.lldbutil import get_stopped_thread<br>
         thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint condition")<br>
         frame0 = thread.GetFrameAtIndex(0)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointIDTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class BreakpointIgnoreCountTestCase(TestBase):<br>
<br>
@@ -118,7 +119,7 @@ class BreakpointIgnoreCountTestCase(Test<br>
         # Frame#0 should be on main.c:37, frame#1 should be on main.c:25, and<br>
         # frame#2 should be on main.c:48.<br>
         #lldbutil.print_stacktraces(process)<br>
-        from lldbutil import get_stopped_thread<br>
+        from lldbsuite.test.lldbutil import get_stopped_thread<br>
         thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint")<br>
         frame0 = thread.GetFrameAtIndex(0)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointLocationsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointOptionsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import shutil<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,9 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import unittest2<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ConsecutiveBreakpoitsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCPPBreakpointLocations(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,10 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import re<br>
-import lldb, lldbutil<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestCPPExceptionBreakpoint (TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointInDummyTarget (TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class InlinedBreakpointsTestCase(TestBase):<br>
     """Bug fixed: rdar://problem/8464339"""<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import shutil<br>
 import subprocess<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CommandHistoryTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CommandRegexTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CmdPythonTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ImportTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class Rdar12586188TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py Mon Nov  2 20:06:18 2015<br>
@@ -10,7 +10,7 @@ import use_lldb_suite<br>
<br>
 import os, sys<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CommandSourceTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CommandLineCompletionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 # rdar://problem/8532131<br>
 # lldb not able to digest the clang-generated debug info correctly with respect to function name<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterBoolRefPtr(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CompactVectorsFormattingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class AdvDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CategoriesDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CppDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterDisablingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class EnumFormatTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class GlobalsDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NamedSummariesDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Mon Nov  2 20:06:18 2015<br>
@@ -9,9 +9,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ObjCDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py Mon Nov  2 20:06:18 2015<br>
@@ -9,9 +9,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NSStringDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterOneIsSingularTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class PtrToArrayDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class PythonSynthDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ScriptDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SkipSummaryDataFormatterTestCase(TestBase):<br>
<br>
@@ -32,7 +32,7 @@ class SkipSummaryDataFormatterTestCase(T<br>
         """Test that that file and class static variables display correctly."""<br>
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)<br>
<br>
-        #import lldbutil<br>
+        #import lldbsuite.test.lldbutil as lldbutil<br>
         lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SmartArrayDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class InitializerListTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxIteratorDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time, re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxListDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time, re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxListDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxMapDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxMultiMapDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxMultiSetDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxSetDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxStringDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxUnorderedDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxVBoolDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LibcxxVectorDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdIteratorDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdListDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdMapDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdStringDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdVBoolDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdVectorDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SynthDataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterSynthValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py Mon Nov  2 20:06:18 2015<br>
@@ -1,3 +1,3 @@<br>
-import lldbinline<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbinline.expectedFailureWindows("<a href="http://llvm.org/pr24663" rel="noreferrer" target="_blank">llvm.org/pr24663</a>")])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class FormatPropagationTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class FrameFormatSmallStructTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterHexCapsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NSArraySyntheticTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NSDictionarySyntheticTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NSSetSyntheticTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterOSTypeTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class PtrRef2TypedefTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DataFormatterRefPtrRecursionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.expectedFailureWindows("<a href="http://llvm.org/pr24772" rel="noreferrer" target="_blank">llvm.org/pr24772</a>")])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class Radar9974002DataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SyntheticCappingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SyntheticFilterRecomputingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.expectedFailureGcc])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class UserFormatVSSummaryTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class VarInAggregateMisuseTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import os.path<br>
<br>
 class PythonSynthDataFormatterTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class VectorTypesFormattingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DeadStripTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class DisassemblyTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class DynamicValueChildCountTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ConvenienceVariablesCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py Mon Nov  2 20:06:18 2015<br>
@@ -5,16 +5,16 @@ from __future__ import print_function<br>
<br>
 import use_lldb_suite<br>
<br>
-import commands<br>
 import lldb<br>
+import commands<br>
 import os<br>
 import time<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 def execute_command (command):<br>
     #print('%% %s' % (command))<br>
-    (exit_status, output) = commands.getstatusoutput (command)<br>
+    (exit_status, output) = commands.getstatusoutput(command)<br>
     #if output:<br>
     #    print(output)<br>
     #print('status = %u' % (exit_status))<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ExprDoesntDeadlockTestCase(TestBase):<br>
<br>
@@ -45,7 +46,7 @@ class ExprDoesntDeadlockTestCase(TestBas<br>
         self.assertTrue(process, PROCESS_IS_VALID)<br>
<br>
         # Frame #0 should be on self.line1 and the break condition should hold.<br>
-        from lldbutil import get_stopped_thread<br>
+        from lldbsuite.test.lldbutil import get_stopped_thread<br>
         thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint condition")<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py Mon Nov  2 20:06:18 2015<br>
@@ -5,16 +5,16 @@ from __future__ import print_function<br>
<br>
 import use_lldb_suite<br>
<br>
-import commands<br>
 import lldb<br>
+import commands<br>
 import os<br>
 import time<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 def execute_command (command):<br>
     # print('%% %s' % (command))<br>
-    (exit_status, output) = commands.getstatusoutput (command)<br>
+    (exit_status, output) = commands.getstatusoutput(command)<br>
     # if output:<br>
     #     print(output)<br>
     # print('status = %u' % (exit_status))<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestFormats(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py Mon Nov  2 20:06:18 2015<br>
@@ -5,8 +5,10 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, time<br>
-import lldb, lldbutil, lldbplatformutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+import lldbsuite.test.lldbplatformutil as lldbplatformutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class AssertingInferiorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ChangedInferiorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py Mon Nov  2 20:06:18 2015<br>
@@ -5,8 +5,10 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, time<br>
-import lldb, lldbutil, lldbplatformutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+import lldbsuite.test.lldbplatformutil as lldbplatformutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CrashingInferiorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py Mon Nov  2 20:06:18 2015<br>
@@ -5,9 +5,10 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, time<br>
-import lldb, lldbutil, lldbplatformutil<br>
-import sys<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+import lldbsuite.test.lldbplatformutil as lldbplatformutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CrashingRecursiveInferiorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time, sys<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestInlineStepping(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import re<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
 import lldb<br>
 import os<br>
 import time<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LaunchWithShellExpandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently<br>
 class LoadUnloadTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class LongjmpTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class MemoryReadTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NonOverlappingIndexVariableCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NoSuchArchTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py Mon Nov  2 20:06:18 2015<br>
@@ -10,8 +10,8 @@ import use_lldb_suite<br>
<br>
 import os.path<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import re<br>
<br>
 class TestImageListMultiArchitecture(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
 import lldb<br>
 import os<br>
 import time<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestPaths(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class PlatformCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class PluginCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class PluginPythonOSPlugin(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessWindows  # for now mini-dump debugging is limited to Windows hosts<br>
 class MiniDumpTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 exe_name = "ProcessAttach"  # Must match Makefile<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import os<br>
 import time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 exe_name = 'AttachDenied'  # Must match Makefile<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
<br>
 class ChangeProcessGroupTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ProcessLaunchTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ValueObjectRecursionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, sys, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class RegisterCommandsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
 import lldb<br>
 import os<br>
 import time<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestRerun(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ReturnValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SetDataTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time, signal<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
<br>
 class SendSignalTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import re<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import re<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SingleQuoteInCommandLineTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,10 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import re<br>
-import lldb, lldbutil<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ReturnValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StopHookCmdTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class StopHookMechanismTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class StopHookForMultipleThreadsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class targetCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NumberOfThreadsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BreakpointAfterJoinTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py Mon Nov  2 20:06:18 2015<br>
@@ -17,8 +17,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipIfWindows<br>
 class ConcurrentEventsTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CreateDuringStepTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CreateAfterAttachTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CreateDuringStepTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ExitDuringBreakpointTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ExitDuringStepTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ThreadJumpTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class MultipleBreakpointTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ThreadStateTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ThreadStepOutTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ThreadExitTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ThreadSpecificBreakTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class LaunchInTerminalTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TypeCompletionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 import datetime<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TypeLookupTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NoreturnUnwind(TestBase):<br>
     mydir = TestBase.compute_mydir(__file__)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SigtrampUnwind(TestBase):<br>
     mydir = TestBase.compute_mydir(__file__)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py Mon Nov  2 20:06:18 2015<br>
@@ -17,8 +17,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 test_source_dirs = ["."]<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ValueMD5CrashTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class HelloWatchLocationTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class HelloWatchpointTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointForMultipleThreadsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -5,8 +5,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
<br>
 class TestStepOverWatchpoint(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchedVariableHitWhenInScopeTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointCommandsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointLLDBCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointPythonCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointConditionCmdTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestWatchpointEvents (TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestValueOfVectorVariableTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchLocationUsingWatchpointSetTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class WatchpointSetErrorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/help/TestHelp.py Mon Nov  2 20:06:18 2015<br>
@@ -10,7 +10,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class HelpCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class AnonymousTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ArrayTypesTestCase(TestBase):<br>
<br>
@@ -102,7 +102,7 @@ class ArrayTypesTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
@@ -187,7 +187,7 @@ class ArrayTypesTestCase(TestBase):<br>
<br>
         # Last, check that "long_6" has a value type of eValueTypeVariableLocal<br>
         # and "argc" has eValueTypeVariableArgument.<br>
-        from lldbutil import value_type_to_str<br>
+        from lldbsuite.test.lldbutil import value_type_to_str<br>
         self.assertTrue(variable.GetValueType() == lldb.eValueTypeVariableLocal,<br>
                         "Variable 'long_6' should have '%s' value type." %<br>
                         value_type_to_str(lldb.eValueTypeVariableLocal))<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BitfieldsTestCase(TestBase):<br>
<br>
@@ -114,7 +114,7 @@ class BitfieldsTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = target.GetProcess().GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BlocksTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ConstVariableTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class EnumTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ForwardDeclarationTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class FunctionTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class GlobalVariablesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py Mon Nov  2 20:06:18 2015<br>
@@ -7,11 +7,11 @@ import use_lldb_suite<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CModulesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class RegisterVariableTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SetValuesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SharedLibTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SharedLibStrippedTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestCStepping(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py Mon Nov  2 20:06:18 2015<br>
@@ -8,9 +8,10 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
-import lldbutil<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ThreadSteppingTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests that C strings work as expected in expressions<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CStringsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.expectedFailureWindows("<a href="http://llvm.org/pr24764" rel="noreferrer" target="_blank">llvm.org/pr24764</a>")] )<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TlsGlobalTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TypedefTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests that bool types work<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPBoolTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CPPBreakpointCommandsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@ Tests calling a function by basename<br>
 """<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CallCPPFunctionTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py Mon Nov  2 20:06:18 2015<br>
@@ -1,6 +1,6 @@<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCppChainedCalls(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class Char1632TestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StaticVariableTestCase(TestBase):<br>
<br>
@@ -71,7 +71,7 @@ class StaticVariableTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,9 +6,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ClassTypesTestCase(TestBase):<br>
<br>
@@ -94,7 +94,7 @@ class ClassTypesTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
@@ -205,7 +205,7 @@ class ClassTypesTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class IterateFrameAndDisassembleTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests that bool types work<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPTestDiamondInheritance(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,9 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CppValueCastTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class DynamicValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPP11EnumTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CPPBreakpointTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Test that global operators are found and evaluated.<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCppGlobalOperators(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -1,6 +1,6 @@<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCppIncompleteTypes(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py Mon Nov  2 20:06:18 2015<br>
@@ -1,6 +1,6 @@<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestWithLimitDebugInfo(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class NamespaceTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests imported namespaces in C++.<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCppNsImport(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@ Tests that functions with the same name<br>
 """<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPStaticMethodsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py Mon Nov  2 20:06:18 2015<br>
@@ -10,8 +10,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 # this test case fails because of rdar://12991846<br>
 # the expression parser does not deal correctly with Unicode expressions<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@ Tests that rvalue references are support<br>
 """<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class RvalueReferencesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Test scopes in C++.<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestCppScopes(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class UnsignedTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPStaticMembersTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@ Tests expressions that distinguish betwe<br>
 """<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPStaticMethodsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class STLTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class StdCXXDisassembleTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests that C++ member and static variables are available where they should be.<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CPPThisTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class UniqueTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class UnsignedTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 def Msg(expr, val):<br>
     return "'expression %s' matches the output (from compiled code): %s" % (expr, val)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CxxWCharTTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py Mon Nov  2 20:06:18 2015<br>
@@ -3,8 +3,8 @@<br>
 import os, time<br>
 import unittest2<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGoUserExpression(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGoASTContext(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGoASTContext(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, time, re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MixedLanguagesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestObjCIvarsInBlocks(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ForwardDeclTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ConstStringTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class FoundationDisassembleTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py Mon Nov  2 20:06:18 2015<br>
@@ -10,8 +10,8 @@ import use_lldb_suite<br>
 import os, os.path, time<br>
 import lldb<br>
 import string<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 file_index = 0<br>
 @skipUnlessDarwin<br>
@@ -195,7 +195,7 @@ class FoundationTestCase(TestBase):<br>
         # The stop reason of the thread should be breakpoint.<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class FoundationTestCase2(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjectDescriptionAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class RuntimeTypesTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 @skipUnlessDarwin<br>
 class FoundationSymtabTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import subprocess<br>
<br>
 class HiddenIvarsTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py Mon Nov  2 20:06:18 2015<br>
@@ -7,14 +7,15 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import os, time<br>
-import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
 import commands<br>
+import re<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 def execute_command (command):<br>
     # print('%% %s' % (command))<br>
-    (exit_status, output) = commands.getstatusoutput (command)<br>
+    (exit_status, output) = commands.getstatusoutput(command)<br>
     # if output:<br>
     #     print(output)<br>
     # print('status = %u' % (exit_status))<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py Mon Nov  2 20:06:18 2015<br>
@@ -8,11 +8,11 @@ import unittest2<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCModulesAutoImportTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py Mon Nov  2 20:06:18 2015<br>
@@ -8,11 +8,11 @@ import unittest2<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class IncompleteModulesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py Mon Nov  2 20:06:18 2015<br>
@@ -8,11 +8,11 @@ import unittest2<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ModulesInlineFunctionsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py Mon Nov  2 20:06:18 2015<br>
@@ -8,11 +8,11 @@ import unittest2<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCModulesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ObjCXXTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCDynamicValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCBuiltinTypes(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCCheckerTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCClassMethod(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class ObjCDynamicSBTypeTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCDynamicValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestObjCIvarOffsets(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestObjCIvarStripped(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py Mon Nov  2 20:06:18 2015<br>
@@ -8,11 +8,11 @@ import unittest2<br>
 import os, time<br>
 import lldb<br>
 import platform<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 from distutils.version import StrictVersion<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCNewSyntaxTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py Mon Nov  2 20:06:18 2015<br>
@@ -13,8 +13,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import re<br>
<br>
 # rdar://problem/9087739<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCPropertyTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCStaticMethodStripped(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCStaticMethod(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCStepping(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCStructArgument(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCClassMethod(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestObjCSuperMethod(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 @skipUnlessDarwin<br>
 class PrintObjTestCase(TestBase):<br>
@@ -51,7 +51,7 @@ class PrintObjTestCase(TestBase):<br>
<br>
         # Let's get the current stopped thread.  We'd like to switch to the<br>
         # other thread to issue our 'po lock_me' command.<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         this_thread = lldbutil.get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue(this_thread)<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class MethodReturningBOOLTestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class Rdar10967107TestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class Rdar10967107TestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 @skipUnlessDarwin<br>
 class Rdar12408181TestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class TestRealDefinition(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py Mon Nov  2 20:06:18 2015<br>
@@ -2,8 +2,8 @@<br>
 Tests that ObjC member variables are available where they should be.<br>
 """<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ObjCSelfTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class BuiltinTrapTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class CreateDuringInstructionStepTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Mon Nov  2 20:06:18 2015<br>
@@ -48,7 +48,7 @@ import types<br>
 import unittest2<br>
 import lldb<br>
 import lldbtest_config<br>
-import lldbutil<br>
+import  lldbutil<br>
 import test_categories<br>
<br>
 from six import add_metaclass<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/logging/TestLogging.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time, string<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class LogTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ import use_lldb_suite<br>
 import os, time<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 @skipUnlessDarwin<br>
 class AddDsymMidExecutionCommandCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-from lldbutil import symbol_type_to_str<br>
+from lldbsuite.test.lldbtest import *<br>
+from lldbsuite.test.lldbutil import symbol_type_to_str<br>
<br>
 class AppleTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestIndirectFunctions(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class OrderFileTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestQueues(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestSafeFuncCalls(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class UniversalTestCase(TestBase):<br>
<br>
@@ -45,7 +45,7 @@ class UniversalTestCase(TestBase):<br>
             "requires i386 or x86_64")<br>
     def test_process_launch_for_universal(self):<br>
         """Test process launch of a universal binary."""<br>
-        from lldbutil import print_registers<br>
+        from lldbsuite.test.lldbutil import print_registers<br>
<br>
         # Invoke the default build rule.<br>
         self.build()<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py Mon Nov  2 20:06:18 2015<br>
@@ -14,7 +14,7 @@ variable.<br>
<br>
 import os, sys<br>
 import platform<br>
-import lldbtest<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 def getArchitecture():<br>
     """Returns the architecture in effect the test suite is running with."""<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_darwin.py Mon Nov  2 20:06:18 2015<br>
@@ -1,7 +1,7 @@<br>
<br>
 from __future__ import print_function<br>
 import os<br>
-import lldbtest<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 from builder_base import *<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class BreakpointAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SBTypeMemberFunctionsTest(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -4,7 +4,7 @@ Test Debugger APIs.<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
<br>
 class DebuggerAPITestCase(TestBase):<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py Mon Nov  2 20:06:18 2015<br>
@@ -17,8 +17,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class APIDefaultConstructorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class DisassembleRawDataTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class Disassemble_VST1_64(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/event/TestEvents.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class EventAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SBFrameFindValueTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SBFormattersAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class FrameAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class InlinedFrameAPITestCase(TestBase):<br>
<br>
@@ -47,7 +48,7 @@ class InlinedFrameAPITestCase(TestBase):<br>
         self.assertTrue(process.GetState() == lldb.eStateStopped,<br>
                         PROCESS_STOPPED)<br>
<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         stack_traces1 = lldbutil.print_stacktraces(process, string_buffer=True)<br>
         if self.TraceOn():<br>
             print("Full stack traces when first stopped on the breakpoint 'inner_inline':")<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class DisasmAPITestCase(TestBase):<br>
<br>
@@ -103,7 +104,7 @@ class DisasmAPITestCase(TestBase):<br>
         self.assertTrue(sa1 and sa2 and sa1 == sa2,<br>
                         "The two starting addresses should be the same")<br>
<br>
-        from lldbutil import get_description<br>
+        from lldbsuite.test.lldbutil import get_description<br>
         desc1 = get_description(sa1)<br>
         desc2 = get_description(sa2)<br>
         self.assertTrue(desc1 and desc2 and desc1 == desc2,<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SymbolAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ import use_lldb_suite<br>
 import os, sys, time<br>
 import lldb<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class HelloWorldTestCase(TestBase):<br>
<br>
@@ -65,7 +65,7 @@ class HelloWorldTestCase(TestBase):<br>
<br>
         thread = process.GetThreadAtIndex(0)<br>
         if thread.GetStopReason() != lldb.eStopReasonBreakpoint:<br>
-            from lldbutil import stop_reason_to_str<br>
+            from lldbsuite.test.lldbutil import stop_reason_to_str<br>
             self.fail(STOPPED_DUE_TO_BREAKPOINT_WITH_STOP_REASON_AS %<br>
                       stop_reason_to_str(thread.GetStopReason()))<br>
<br>
@@ -95,7 +95,7 @@ class HelloWorldTestCase(TestBase):<br>
         self.assertTrue(error.Success() and process, PROCESS_IS_VALID)<br>
<br>
         # Let's check the stack traces of the attached process.<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         stacktraces = lldbutil.print_stacktraces(process, string_buffer=True)<br>
         self.expect(stacktraces, exe=False,<br>
             substrs = ['main.c:%d' % self.line2,<br>
@@ -137,7 +137,7 @@ class HelloWorldTestCase(TestBase):<br>
             startstr = name)<br>
<br>
         # Let's check the stack traces of the attached process.<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         stacktraces = lldbutil.print_stacktraces(process, string_buffer=True)<br>
         self.expect(stacktraces, exe=False,<br>
             substrs = ['main.c:%d' % self.line2,<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class CommandInterpreterAPICase(TestBase):<br>
<br>
@@ -63,7 +63,7 @@ class CommandInterpreterAPICase(TestBase<br>
         process = ci.GetProcess()<br>
         self.assertTrue(process)<br>
<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         if process.GetState() != lldb.eStateStopped:<br>
             self.fail("Process should be in the 'stopped' state, "<br>
                       "instead the actual state is: '%s'" %<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class FrameUtilsTestCase(TestBase):<br>
<br>
@@ -41,7 +41,7 @@ class FrameUtilsTestCase(TestBase):<br>
         self.assertTrue(process.GetState() == lldb.eStateStopped,<br>
                         PROCESS_STOPPED)<br>
<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         thread = lldbutil.get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue (thread)<br>
         frame0 = thread.GetFrameAtIndex(0)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class LLDBIteratorTestCase(TestBase):<br>
<br>
@@ -40,7 +40,7 @@ class LLDBIteratorTestCase(TestBase):<br>
         if not process:<br>
             self.fail("SBTarget.LaunchProcess() failed")<br>
<br>
-        from lldbutil import get_description<br>
+        from lldbsuite.test.lldbutil import get_description<br>
         yours = []<br>
         for i in range(target.GetNumModules()):<br>
             yours.append(target.GetModuleAtIndex(i))<br>
@@ -72,7 +72,7 @@ class LLDBIteratorTestCase(TestBase):<br>
<br>
         self.assertTrue(target.GetNumBreakpoints() == 2)<br>
<br>
-        from lldbutil import get_description<br>
+        from lldbsuite.test.lldbutil import get_description<br>
         yours = []<br>
         for i in range(target.GetNumBreakpoints()):<br>
             yours.append(target.GetBreakpointAtIndex(i))<br>
@@ -106,7 +106,7 @@ class LLDBIteratorTestCase(TestBase):<br>
         if not process:<br>
             self.fail("SBTarget.LaunchProcess() failed")<br>
<br>
-        from lldbutil import print_stacktrace<br>
+        from lldbsuite.test.lldbutil import print_stacktrace<br>
         stopped_due_to_breakpoint = False<br>
         for thread in process:<br>
             if self.TraceOn():<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class RegistersIteratorTestCase(TestBase):<br>
<br>
@@ -40,7 +40,7 @@ class RegistersIteratorTestCase(TestBase<br>
         if not process:<br>
             self.fail("SBTarget.LaunchProcess() failed")<br>
<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         for thread in process:<br>
             if thread.GetStopReason() == lldb.eStopReasonBreakpoint:<br>
                 for frame in thread:<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ThreadsStackTracesTestCase(TestBase):<br>
<br>
@@ -41,7 +41,7 @@ class ThreadsStackTracesTestCase(TestBas<br>
         if not process:<br>
             self.fail("SBTarget.LaunchProcess() failed")<br>
<br>
-        import lldbutil<br>
+        import lldbsuite.test.lldbutil as lldbutil<br>
         if process.GetState() != lldb.eStateStopped:<br>
             self.fail("Process should be in the 'stopped' state, "<br>
                       "instead the actual state is: '%s'" %<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,8 @@ import use_lldb_suite<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-from lldbutil import symbol_type_to_str<br>
+from lldbsuite.test.lldbtest import *<br>
+from lldbsuite.test.lldbutil import symbol_type_to_str<br>
<br>
 class ModuleAndSectionAPIsTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ObjCSBTypeTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbutil import get_stopped_thread, state_type_to_str<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ProcessAPITestCase(TestBase):<br>
<br>
@@ -187,7 +187,7 @@ class ProcessAPITestCase(TestBase):<br>
         location = int(val.GetLocation(), 16)<br>
<br>
         # Note that the canonical from of the bytearray is little endian.<br>
-        from lldbutil import int_to_bytearray, bytearray_to_int<br>
+        from lldbsuite.test.lldbutil import int_to_bytearray, bytearray_to_int<br>
<br>
         byteSize = val.GetByteSize()<br>
         bytes = int_to_bytearray(256, byteSize)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class ProcessIOTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class Radar12481949DataFormatterTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py Mon Nov  2 20:06:18 2015<br>
@@ -6,9 +6,9 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 from math import fabs<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SBDataAPICase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py Mon Nov  2 20:06:18 2015<br>
@@ -1,4 +1,4 @@<br>
-import lldbinline<br>
-import lldbtest<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
+import lldbsuite.test.lldbtest as lldbtest<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals(), [lldbtest.skipIfFreeBSD,lldbtest.skipIfLinux,lldbtest.skipIfWindows])<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py Mon Nov  2 20:06:18 2015<br>
@@ -1,3 +1,3 @@<br>
-import lldbinline<br>
+import lldbsuite.test.lldbinline as lldbinline<br>
<br>
 lldbinline.MakeInlineTest(__file__, globals())<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py Mon Nov  2 20:06:18 2015<br>
@@ -6,8 +6,8 @@ import use_lldb_suite<br>
<br>
 import os, sys, time<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SBValuePersistTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ from __future__ import print_function<br>
<br>
 import use_lldb_suite<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SectionAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbutil import get_stopped_thread, state_type_to_str<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbutil import get_stopped_thread, state_type_to_str<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SignalsAPITestCase(TestBase):<br>
     mydir = TestBase.compute_mydir(__file__)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SymbolContextAPITestCase(TestBase):<br>
<br>
@@ -44,7 +45,7 @@ class SymbolContextAPITestCase(TestBase)<br>
         self.assertTrue(process, PROCESS_IS_VALID)<br>
<br>
         # Frame #0 should be on self.line.<br>
-        from lldbutil import get_stopped_thread<br>
+        from lldbsuite.test.lldbutil import get_stopped_thread<br>
         thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)<br>
         self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint")<br>
         frame0 = thread.GetFrameAtIndex(0)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,9 @@ import use_lldb_suite<br>
 import unittest2<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TargetAPITestCase(TestBase):<br>
<br>
@@ -233,7 +234,7 @@ class TargetAPITestCase(TestBase):<br>
         target = self.dbg.CreateTarget(exe)<br>
         self.assertTrue(target, VALID_TARGET)<br>
<br>
-        from lldbutil import get_description<br>
+        from lldbsuite.test.lldbutil import get_description<br>
<br>
         # get_description() allows no option to mean lldb.eDescriptionLevelBrief.<br>
         desc = get_description(target)<br>
@@ -364,7 +365,7 @@ class TargetAPITestCase(TestBase):<br>
         #print("symbol1:", symbol1)<br>
         #print("symbol2:", symbol2)<br>
<br>
-        from lldbutil import get_description<br>
+        from lldbsuite.test.lldbutil import get_description<br>
         desc1 = get_description(symbol1)<br>
         desc2 = get_description(symbol2)<br>
         self.assertTrue(desc1 and desc2 and desc1 == desc2,<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbutil import get_stopped_thread, get_caller_symbol<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbutil import get_stopped_thread, get_caller_symbol<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ThreadAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TypeAndTypeListTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ValueAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ChangeValueAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py Mon Nov  2 20:06:18 2015<br>
@@ -9,8 +9,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class ValueAsLinkedListTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ import use_lldb_suite<br>
 import os, sys, time<br>
 import lldb<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class HelloWorldTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SetWatchpointAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class WatchpointIgnoreCountTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class WatchpointIteratorTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-import lldbutil<br>
-from lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class WatchpointConditionAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SetWatchlocationAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,9 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import re<br>
-import lldb, lldbutil<br>
-from lldbtest import *<br>
+import lldb<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TargetWatchAddressAPITestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/settings/TestSettings.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time, re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SettingsCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os, time, re<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class SettingsCommandTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py Mon Nov  2 20:06:18 2015<br>
@@ -14,8 +14,8 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 class SourceManagerTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestSTTYBeforeAndAfter(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiExitTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiFileTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiExecTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import use_lldb_suite<br>
<br>
 import unittest2<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiDataTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ from __future__ import print_function<br>
<br>
 import use_lldb_suite<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiTestCaseBase(Base):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiStackTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiTargetTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py Mon Nov  2 20:06:18 2015<br>
@@ -7,7 +7,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldbmi_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class MiVarTestCase(lldbmi_testcase.MiTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py Mon Nov  2 20:06:18 2015<br>
@@ -8,8 +8,8 @@ import use_lldb_suite<br>
<br>
 import os<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import binascii<br>
<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py Mon Nov  2 20:06:18 2015<br>
@@ -5,7 +5,7 @@ import use_lldb_suite<br>
 import gdbremote_testcase<br>
 import lldbgdbserverutils<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py Mon Nov  2 20:06:18 2015<br>
@@ -5,7 +5,7 @@ import use_lldb_suite<br>
 import gdbremote_testcase<br>
 import lldbgdbserverutils<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import gdbremote_testcase<br>
 import lldbgdbserverutils<br>
 import sys<br>
<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
     """Test QSaveRegisterState/QRestoreRegisterState support."""<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import sys<br>
<br>
 import unittest2<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py Mon Nov  2 20:06:18 2015<br>
@@ -3,7 +3,7 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py Mon Nov  2 20:06:18 2015<br>
@@ -19,7 +19,7 @@ import gdbremote_testcase<br>
 import lldbgdbserverutils<br>
 import platform<br>
 import signal<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import re<br>
 import select<br>
 import socket<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py Mon Nov  2 20:06:18 2015<br>
@@ -8,7 +8,7 @@ import os<br>
 import select<br>
 import tempfile<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py Mon Nov  2 20:06:18 2015<br>
@@ -20,7 +20,7 @@ import subprocess<br>
 import sys<br>
 import tempfile<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
 from lldbgdbserverutils import *<br>
 import logging<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py Mon Nov  2 20:06:18 2015<br>
@@ -4,7 +4,7 @@ import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
 import signal<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteAbort(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
     mydir = TestBase.compute_mydir(__file__)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py Mon Nov  2 20:06:18 2015<br>
@@ -4,7 +4,7 @@ import use_lldb_suite<br>
<br>
 import gdbremote_testcase<br>
 import signal<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class TestGdbRemoteSegFault(gdbremote_testcase.GdbRemoteTestCaseBase):<br>
     mydir = TestBase.compute_mydir(__file__)<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py<br>
URL: <a href="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" rel="noreferrer" target="_blank">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</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py Mon Nov  2 20:06:18 2015<br>
@@ -13,7 +13,7 @@ import six<br>
 import socket_packet_pump<br>
 import subprocess<br>
 import time<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 from six.moves import queue<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/AbstractBase.py Mon Nov  2 20:06:18 2015<br>
@@ -7,8 +7,8 @@ from __future__ import print_function<br>
 import os, time<br>
 import re<br>
 import lldb<br>
-from lldbtest import *<br>
-import lldbutil<br>
+from lldbsuite.test.lldbtest import *<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
<br>
 def Msg(var, val, using_frame_variable):<br>
     return "'%s %s' matches the output (from compiled code): %s" % (<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/HideTestFailures.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import AbstractBase<br>
 import sys<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 # rdar://problem/9649573<br>
 # Capture the lldb and gdb-remote log files for test failures when run with no "-w" option<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import AbstractBase<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class FloatTypesTestCase(AbstractBase.GenericTester):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import AbstractBase<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class FloatTypesExprTestCase(AbstractBase.GenericTester):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import AbstractBase<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class IntegerTypesTestCase(AbstractBase.GenericTester):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py Mon Nov  2 20:06:18 2015<br>
@@ -9,7 +9,7 @@ import use_lldb_suite<br>
 import AbstractBase<br>
 import lldb<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class IntegerTypesExprTestCase(AbstractBase.GenericTester):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py Mon Nov  2 20:06:18 2015<br>
@@ -7,9 +7,9 @@ from __future__ import print_function<br>
 import use_lldb_suite<br>
<br>
 import lldb<br>
-import lldbutil<br>
+import lldbsuite.test.lldbutil as lldbutil<br>
 import sys<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 class RecursiveTypesTestCase(TestBase):<br>
<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py?rev=251886&r1=251885&r2=251886&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py?rev=251886&r1=251885&r2=251886&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py Mon Nov  2 20:06:18 2015<br>
@@ -6,7 +6,7 @@ import use_lldb_suite<br>
<br>
 import os, time<br>
 import lldb<br>
-from lldbtest import *<br>
+from lldbsuite.test.lldbtest import *<br>
<br>
 @skipUnlessDarwin<br>
 class AddDsymCommandCase(TestBase):<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">-Todd</div></div>
</div>