From 77db4a855239049488e09f28c6665fdb3b51ef90 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Thu, 22 Oct 2015 20:06:20 +0000 Subject: [PATCH] Update every test to import `lldb_shared`. This is necessary in order to allow third party modules to be located under lldb/third_party rather than under the test folder directly. Since we're already touching every test file anyway, we also go ahead and delete the unittest2 import and main block wherever possible. The ability to run a test as a standalone file has already been broken for some time, and if we decide we want this back, we should use unittest instead of unittest2. A few places could not have the import of unittest2 removed,because they depend on the unittest2.expectedFailure or skip decorators. Removing all those was orthogonal in spirit to the purpose of this CL, so the import of unittest2 remains in those files that were using it for its test decorators. Those can be addressed separately. llvm-svn: 251055 --- .../test/android/platform/TestDefaultCacheLineSize.py | 9 ++------- .../check_public_api_headers/TestPublicAPIHeaders.py | 7 ------- .../api/multiple-debuggers/TestMultipleDebuggers.py | 7 ------- lldb/test/api/multithreaded/TestMultithreaded.py | 7 ------- lldb/test/arm_emulation/TestEmulations.py | 10 ++-------- .../test/benchmarks/continue/TestBenchmarkContinue.py | 9 ++------- lldb/test/benchmarks/disassembly/TestDisassembly.py | 10 ++-------- .../disassembly/TestDoAttachThenDisassembly.py | 10 ++-------- .../disassembly/TestXcode41Vs42GDBDisassembly.py | 10 ++-------- lldb/test/benchmarks/expression/TestExpressionCmd.py | 10 ++-------- lldb/test/benchmarks/expression/TestRepeatedExprs.py | 10 ++-------- .../frame_variable/TestFrameVariableResponse.py | 10 ++-------- lldb/test/benchmarks/startup/TestStartupDelays.py | 10 ++-------- .../benchmarks/stepping/TestRunHooksThenSteppings.py | 10 ++-------- lldb/test/benchmarks/stepping/TestSteppingSpeed.py | 10 ++-------- .../TestCompileRunToBreakpointTurnaround.py | 10 ++-------- lldb/test/driver/batch_mode/TestBatchMode.py | 9 ++++----- .../call-function/TestCallStdStringFunction.py | 9 ++------- .../call-function/TestCallStopAndContinue.py | 9 ++------- .../call-function/TestCallUserDefinedFunction.py | 10 ++-------- .../call-restarts/TestCallThatRestarts.py | 9 ++------- .../call-throws/TestCallThatThrows.py | 9 ++------- lldb/test/expression_command/char/TestExprsChar.py | 9 ++------- .../expr-in-syscall/TestExpressionInSyscall.py | 9 ++------- .../expression_command/formatters/TestFormatters.py | 9 ++------- lldb/test/expression_command/issue_11588/Test11588.py | 10 ++-------- .../expression_command/options/TestExprOptions.py | 9 ++------- .../TestPersistObjCPointeeType.py | 9 ++------- .../persistent_ptr_update/TestPersistentPtrUpdate.py | 9 ++------- .../persistent_types/TestNestedPersistentTypes.py | 9 ++------- .../persistent_types/TestPersistentTypes.py | 10 ++-------- .../persistent_variables/TestPersistentVariables.py | 9 ++------- .../po_verbosity/TestPoVerbosity.py | 10 ++-------- .../expression_command/radar_8638051/Test8638051.py | 10 ++-------- .../radar_9531204/TestPrintfAfterUp.py | 10 ++-------- .../radar_9673664/TestExprHelpExamples.py | 10 ++-------- lldb/test/expression_command/test/TestExprs.py | 11 ++++------- lldb/test/expression_command/test/TestExprs2.py | 10 ++-------- .../expression_command/timeout/TestCallWithTimeout.py | 10 ++-------- .../TestObjCTypeQueryFromOtherCompileUnit.py | 10 ++-------- .../functionalities/abbreviation/TestAbbreviations.py | 11 ++--------- .../abbreviation/TestCommonShortSpellings.py | 11 ++--------- lldb/test/functionalities/archives/TestBSDArchives.py | 10 ++-------- lldb/test/functionalities/asan/TestMemoryHistory.py | 9 ++------- lldb/test/functionalities/asan/TestReportData.py | 9 ++------- .../functionalities/attach_resume/TestAttachResume.py | 9 ++------- .../test/functionalities/avoids-fd-leak/TestFdLeak.py | 10 ++-------- .../backticks/TestBackticksWithoutATarget.py | 9 ++------- .../breakpoint_command/TestBreakpointCommand.py | 9 ++------- .../TestBreakpointCommandsFromPython.py | 10 ++-------- .../breakpoint_command/TestRegexpBreakCommand.py | 10 ++-------- .../breakpoint_conditions/TestBreakpointConditions.py | 10 ++-------- .../breakpoint/breakpoint_ids/TestBreakpointIDs.py | 10 ++-------- .../TestBreakpointIgnoreCount.py | 10 ++-------- .../breakpoint_locations/TestBreakpointLocations.py | 10 ++-------- .../breakpoint_options/TestBreakpointOptions.py | 9 ++------- .../breakpoint/comp_dir_symlink/TestCompDirSymLink.py | 10 ++-------- .../TestConsecutiveBreakpoints.py | 9 ++------- .../breakpoint/cpp/TestCPPBreakpointLocations.py | 11 ++--------- .../cpp_exception/TestCPPExceptionBreakpoint.py | 9 ++------- .../TestBreakpointsWithNoTargets.py | 9 ++------- .../inlined_breakpoints/TestInlinedBreakpoints.py | 10 ++-------- .../breakpoint/objc/TestObjCBreakpoints.py | 9 ++------- .../command_history/TestCommandHistory.py | 10 ++-------- .../functionalities/command_regex/TestCommandRegex.py | 9 ++------- .../command_script/TestCommandScript.py | 10 ++-------- .../command_script/import/TestImport.py | 10 ++-------- .../import/rdar-12586188/TestRdar12586188.py | 9 ++------- .../command_source/TestCommandSource.py | 10 ++-------- .../test/functionalities/completion/TestCompletion.py | 10 ++-------- .../conditional_break/TestConditionalBreak.py | 11 ++--------- .../boolreference/TestFormattersBoolRefPtr.py | 10 ++-------- .../compactvectors/TestCompactVectors.py | 9 ++------- .../data-formatter-advanced/TestDataFormatterAdv.py | 10 ++-------- .../TestDataFormatterCategories.py | 9 ++------- .../data-formatter-cpp/TestDataFormatterCpp.py | 9 ++------- .../TestDataFormatterDisabling.py | 10 ++-------- .../TestDataFormatterEnumFormat.py | 9 ++------- .../TestDataFormatterGlobals.py | 10 ++-------- .../TestDataFormatterNamedSummaries.py | 10 ++-------- .../data-formatter-objc/TestDataFormatterObjC.py | 9 ++------- .../nsstring/TestDataFormatterNSString.py | 10 ++-------- .../TestFormattersOneIsSingular.py | 10 ++-------- .../TestPtrToArrayFormatting.py | 10 ++-------- .../TestDataFormatterPythonSynth.py | 10 ++-------- .../data-formatter-script/TestDataFormatterScript.py | 10 ++-------- .../TestDataFormatterSkipSummary.py | 10 ++-------- .../TestDataFormatterSmartArray.py | 10 ++-------- .../libcxx/initializerlist/TestInitializerList.py | 9 ++------- .../libcxx/iterator/TestDataFormatterLibccIterator.py | 9 ++------- .../libcxx/list/TestDataFormatterLibcxxList.py | 9 ++------- .../list/loop/TestDataFormatterLibcxxListLoop.py | 9 ++------- .../libcxx/map/TestDataFormatterLibccMap.py | 9 ++------- .../libcxx/multimap/TestDataFormatterLibccMultiMap.py | 9 ++------- .../multiset/TestDataFormatterLibcxxMultiSet.py | 9 ++------- .../libcxx/set/TestDataFormatterLibcxxSet.py | 9 ++------- .../libcxx/string/TestDataFormatterLibcxxString.py | 9 ++------- .../libcxx/unordered/TestDataFormatterUnordered.py | 9 ++------- .../libcxx/vbool/TestDataFormatterLibcxxVBool.py | 9 ++------- .../libcxx/vector/TestDataFormatterLibcxxVector.py | 9 ++------- .../iterator/TestDataFormatterStdIterator.py | 9 ++------- .../libstdcpp/list/TestDataFormatterStdList.py | 9 ++------- .../libstdcpp/map/TestDataFormatterStdMap.py | 9 ++------- .../libstdcpp/string/TestDataFormatterStdString.py | 9 ++------- .../libstdcpp/vbool/TestDataFormatterStdVBool.py | 9 ++------- .../libstdcpp/vector/TestDataFormatterStdVector.py | 9 ++------- .../data-formatter-synth/TestDataFormatterSynth.py | 10 ++-------- .../TestDataFormatterSynthVal.py | 9 ++------- .../format-propagation/TestFormatPropagation.py | 9 ++------- .../TestFrameFormatSmallStruct.py | 9 ++------- .../hexcaps/TestDataFormatterHexCaps.py | 10 ++-------- .../nsarraysynth/TestNSArraySynthetic.py | 10 ++-------- .../nsdictionarysynth/TestNSDictionarySynthetic.py | 10 ++-------- .../data-formatter/nssetsynth/TestNSSetSynthetic.py | 9 ++------- .../ostypeformatting/TestFormattersOsType.py | 10 ++-------- .../ptr_ref_typedef/TestPtrRef2Typedef.py | 9 ++------- .../TestDataFormatterRefPtrRecursion.py | 9 ++------- .../summary-string-onfail/Test-rdar-9974002.py | 10 ++-------- .../synthcapping/TestSyntheticCapping.py | 9 ++------- .../synthupdate/TestSyntheticFilterRecompute.py | 10 ++-------- .../user-format-vs-summary/TestUserFormatVsSummary.py | 9 ++------- .../TestVarInAggregateMisuse.py | 9 ++------- .../TestDataFormatterVarScriptFormatting.py | 9 ++------- .../vector-types/TestVectorTypesFormatting.py | 9 ++------- lldb/test/functionalities/dead-strip/TestDeadStrip.py | 10 ++-------- .../disassembly/TestDisassembleBreakpoint.py | 10 ++-------- .../TestDynamicValueChildCount.py | 9 ++------- .../embedded_interpreter/TestConvenienceVariables.py | 10 ++-------- lldb/test/functionalities/exec/TestExec.py | 10 ++-------- .../expr-doesnt-deadlock/TestExprDoesntBlock.py | 9 ++------- .../functionalities/fat_archives/TestFatArchives.py | 10 ++-------- lldb/test/functionalities/format/TestFormats.py | 9 ++------- .../inferior-assert/TestInferiorAssert.py | 9 ++------- .../inferior-changed/TestInferiorChanged.py | 10 ++-------- .../inferior-crashing/TestInferiorCrashing.py | 10 ++-------- .../recursive-inferior/TestRecursiveInferior.py | 9 ++------- .../inline-stepping/TestInlineStepping.py | 9 ++------- .../functionalities/jitloader_gdb/TestJITLoaderGDB.py | 10 +++------- .../TestLaunchWithShellExpand.py | 10 ++-------- .../functionalities/load_unload/TestLoadUnload.py | 9 ++------- lldb/test/functionalities/longjmp/TestLongjmp.py | 9 ++------- .../functionalities/memory/read/TestMemoryRead.py | 10 ++-------- .../TestIndexVariable.py | 9 ++------- .../test/functionalities/nosucharch/TestNoSuchArch.py | 10 ++-------- .../object-file/TestImageListMultiArchitecture.py | 9 ++------- lldb/test/functionalities/paths/TestPaths.py | 10 ++-------- .../functionalities/platform/TestPlatformCommand.py | 10 ++-------- .../plugins/commands/TestPluginCommands.py | 10 ++-------- .../plugins/python_os_plugin/TestPythonOSPlugin.py | 10 ++-------- .../postmortem/minidump/TestMiniDump.py | 9 ++------- .../process_attach/TestProcessAttach.py | 9 ++------- .../process_attach/attach_denied/TestAttachDenied.py | 10 ++-------- .../process_group/TestChangeProcessGroup.py | 9 ++------- .../process_launch/TestProcessLaunch.py | 11 ++--------- .../recursion/TestValueObjectRecursion.py | 9 ++------- lldb/test/functionalities/register/TestRegisters.py | 9 ++------- lldb/test/functionalities/rerun/TestRerun.py | 11 ++--------- .../functionalities/return-value/TestReturnValue.py | 9 ++------- lldb/test/functionalities/set-data/TestSetData.py | 9 ++------- lldb/test/functionalities/signal/TestSendSignal.py | 9 ++------- .../signal/handle-segv/TestHandleSegv.py | 9 ++------- lldb/test/functionalities/signal/raise/TestRaise.py | 9 ++------- .../TestSingleQuoteInFilename.py | 10 ++-------- .../step-avoids-no-debug/TestStepNoDebug.py | 10 ++-------- .../test/functionalities/stop-hook/TestStopHookCmd.py | 8 -------- .../stop-hook/TestStopHookMechanism.py | 10 ++-------- .../multiple_threads/TestStopHookMultipleThreads.py | 10 ++-------- .../target_command/TestTargetCommand.py | 9 ++------- lldb/test/functionalities/thread/TestNumThreads.py | 9 ++------- .../thread/break_after_join/TestBreakAfterJoin.py | 9 ++------- .../thread/concurrent_events/TestConcurrentEvents.py | 11 +++-------- .../thread/crash_during_step/TestCrashDuringStep.py | 10 ++-------- .../create_after_attach/TestCreateAfterAttach.py | 10 ++-------- .../thread/create_during_step/TestCreateDuringStep.py | 9 ++------- .../thread/exit_during_break/TestExitDuringBreak.py | 9 ++------- .../thread/exit_during_step/TestExitDuringStep.py | 9 ++------- .../functionalities/thread/jump/TestThreadJump.py | 9 ++------- .../thread/multi_break/TestMultipleBreakpoints.py | 9 ++------- .../functionalities/thread/state/TestThreadStates.py | 10 +++------- .../thread/step_out/TestThreadStepOut.py | 9 ++------- .../thread/thread_exit/TestThreadExit.py | 9 ++------- .../TestThreadSpecificBreakpoint.py | 10 ++-------- lldb/test/functionalities/tty/TestTerminal.py | 11 +++-------- .../type_completion/TestTypeCompletion.py | 9 ++------- .../functionalities/type_lookup/TestTypeLookup.py | 9 ++------- .../unwind/noreturn/TestNoreturnUnwind.py | 10 ++-------- .../unwind/sigtramp/TestSigtrampUnwind.py | 9 ++------- .../unwind/standard/TestStandardUnwind.py | 10 +++------- .../value_md5_crash/TestValueMD5Crash.py | 9 ++------- .../hello_watchlocation/TestWatchLocation.py | 10 ++-------- .../hello_watchpoint/TestMyFirstWatchpoint.py | 10 ++-------- .../multiple_threads/TestWatchpointMultipleThreads.py | 10 ++-------- .../step_over_watchpoint/TestStepOverWatchpoint.py | 9 ++------- .../TestWatchedVarHitWhenInScope.py | 11 +++-------- .../watchpoint_commands/TestWatchpointCommands.py | 10 ++-------- .../command/TestWatchpointCommandLLDB.py | 10 ++-------- .../command/TestWatchpointCommandPython.py | 10 ++-------- .../condition/TestWatchpointConditionCmd.py | 10 ++-------- .../watchpoint_events/TestWatchpointEvents.py | 9 ++------- .../TestValueOfVectorVariable.py | 9 ++------- .../TestWatchLocationWithWatchSet.py | 10 ++-------- .../TestWatchpointSetErrorCases.py | 10 ++-------- lldb/test/help/TestHelp.py | 10 ++-------- lldb/test/lang/c/anonymous/TestAnonymous.py | 9 ++------- lldb/test/lang/c/array_types/TestArrayTypes.py | 10 ++-------- lldb/test/lang/c/bitfields/TestBitfields.py | 10 ++-------- lldb/test/lang/c/blocks/TestBlocks.py | 10 +++------- .../test/lang/c/const_variables/TestConstVariables.py | 9 ++------- lldb/test/lang/c/enum_types/TestEnumTypes.py | 9 ++------- lldb/test/lang/c/forward/TestForwardDeclaration.py | 10 ++-------- lldb/test/lang/c/function_types/TestFunctionTypes.py | 9 ++------- .../lang/c/global_variables/TestGlobalVariables.py | 10 ++-------- lldb/test/lang/c/modules/TestCModules.py | 9 ++------- .../c/register_variables/TestRegisterVariables.py | 9 ++------- lldb/test/lang/c/set_values/TestSetValues.py | 10 ++-------- lldb/test/lang/c/shared_lib/TestSharedLib.py | 8 ++------ .../TestSharedLibStrippedSymbols.py | 8 ++------ lldb/test/lang/c/stepping/TestStepAndBreakpoints.py | 9 ++------- lldb/test/lang/c/stepping/TestThreadStepping.py | 10 ++-------- lldb/test/lang/c/strings/TestCStrings.py | 6 ------ lldb/test/lang/c/tls_globals/TestTlsGlobals.py | 10 +++------- lldb/test/lang/c/typedef/Testtypedef.py | 9 ++------- lldb/test/lang/cpp/bool/TestCPPBool.py | 6 ------ .../breakpoint-commands/TestCPPBreakpointCommands.py | 11 ++--------- .../lang/cpp/call-function/TestCallCPPFunction.py | 6 ------ .../lang/cpp/chained-calls/TestCppChainedCalls.py | 6 ------ lldb/test/lang/cpp/char1632_t/TestChar1632T.py | 9 ++------- .../test/lang/cpp/class_static/TestStaticVariables.py | 10 ++-------- lldb/test/lang/cpp/class_types/TestClassTypes.py | 9 ++------- .../lang/cpp/class_types/TestClassTypesDisassembly.py | 9 ++------- lldb/test/lang/cpp/diamond/TestDiamond.py | 6 ------ lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py | 11 +++-------- lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py | 10 ++-------- lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py | 8 ++------ .../cpp/exceptions/TestCPPExceptionBreakpoints.py | 10 ++-------- .../cpp/global_operators/TestCppGlobalOperators.py | 7 ------- .../cpp/incomplete-types/TestCppIncompleteTypes.py | 6 ------ lldb/test/lang/cpp/namespace/TestNamespace.py | 9 ++------- lldb/test/lang/cpp/nsimport/TestCppNsImport.py | 7 ------- .../overloaded-functions/TestOverloadedFunctions.py | 6 ------ lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py | 10 +++------- .../cpp/rvalue-references/TestRvalueReferences.py | 6 ------ lldb/test/lang/cpp/scope/TestCppScope.py | 6 ------ lldb/test/lang/cpp/signed_types/TestSignedTypes.py | 10 ++-------- .../lang/cpp/static_members/TestCPPStaticMembers.py | 11 ++++------- .../lang/cpp/static_methods/TestCPPStaticMethods.py | 6 ------ lldb/test/lang/cpp/stl/TestSTL.py | 11 +++-------- lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py | 11 +++-------- lldb/test/lang/cpp/this/TestCPPThis.py | 6 ------ lldb/test/lang/cpp/unique-types/TestUniqueTypes.py | 10 ++-------- .../test/lang/cpp/unsigned_types/TestUnsignedTypes.py | 10 ++-------- lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py | 9 ++------- lldb/test/lang/go/goroutines/TestGoroutines.py | 10 ++-------- lldb/test/lang/go/types/TestGoASTContext.py | 10 ++-------- lldb/test/lang/mixed/TestMixedLanguages.py | 9 ++------- lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py | 9 ++------- lldb/test/lang/objc/forward-decl/TestForwardDecl.py | 9 ++------- lldb/test/lang/objc/foundation/TestConstStrings.py | 10 ++-------- .../lang/objc/foundation/TestFoundationDisassembly.py | 11 +++-------- lldb/test/lang/objc/foundation/TestObjCMethods.py | 10 ++-------- lldb/test/lang/objc/foundation/TestObjCMethods2.py | 9 ++------- .../lang/objc/foundation/TestObjectDescriptionAPI.py | 10 ++-------- lldb/test/lang/objc/foundation/TestRuntimeTypes.py | 9 ++------- lldb/test/lang/objc/foundation/TestSymbolTable.py | 10 ++-------- lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py | 11 +++-------- lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py | 9 ++------- .../objc/modules-auto-import/TestModulesAutoImport.py | 10 +++------- .../objc/modules-incomplete/TestIncompleteModules.py | 10 +++------- .../TestModulesInlineFunctions.py | 10 +++------- lldb/test/lang/objc/modules/TestObjCModules.py | 10 +++------- lldb/test/lang/objc/objc++/TestObjCXX.py | 9 ++------- .../objc-baseclass-sbtype/TestObjCBaseClassSBType.py | 9 ++------- .../objc/objc-builtin-types/TestObjCBuiltinTypes.py | 9 ++------- lldb/test/lang/objc/objc-checker/TestObjCCheckers.py | 9 ++------- .../objc/objc-class-method/TestObjCClassMethod.py | 9 ++------- .../objc/objc-dyn-sbtype/TestObjCDynamicSBType.py | 9 ++------- .../objc/objc-dynamic-value/TestObjCDynamicValue.py | 9 ++------- .../objc/objc-ivar-offsets/TestObjCIvarOffsets.py | 9 ++------- .../objc/objc-ivar-stripped/TestObjCIvarStripped.py | 9 ++------- .../lang/objc/objc-new-syntax/TestObjCNewSyntax.py | 10 +++------- .../lang/objc/objc-optimized/TestObjcOptimized.py | 10 ++-------- lldb/test/lang/objc/objc-property/TestObjCProperty.py | 9 ++------- .../TestObjCStaticMethodStripped.py | 9 ++------- .../objc/objc-static-method/TestObjCStaticMethod.py | 9 ++------- lldb/test/lang/objc/objc-stepping/TestObjCStepping.py | 9 ++------- .../objc-struct-argument/TestObjCStructArgument.py | 9 ++------- .../objc/objc-struct-return/TestObjCStructReturn.py | 9 ++------- lldb/test/lang/objc/objc-super/TestObjCSuper.py | 9 ++------- lldb/test/lang/objc/print-obj/TestPrintObj.py | 10 ++-------- .../objc/radar-9691614/TestObjCMethodReturningBOOL.py | 10 ++-------- lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py | 9 ++------- lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py | 9 ++------- lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py | 9 ++------- .../lang/objc/real-definition/TestRealDefinition.py | 9 ++------- lldb/test/lang/objc/self/TestObjCSelf.py | 6 ------ lldb/test/linux/builtin_trap/TestBuiltinTrap.py | 9 ++------- .../TestCreateDuringInstructionStep.py | 9 ++------- lldb/test/lldbinline.py | 1 - lldb/test/lldbpexpect.py | 3 ++- lldb/test/logging/TestLogging.py | 10 ++-------- .../macosx/add-dsym/TestAddDsymMidExecutionCommand.py | 9 ++------- .../apple_types/TestAppleTypesIsProduced.py | 10 ++-------- .../macosx/indirect_symbol/TestIndirectSymbols.py | 11 ++--------- lldb/test/macosx/order/TestOrderFile.py | 9 ++------- lldb/test/macosx/queues/TestQueues.py | 10 +++------- .../macosx/safe-to-func-call/TestSafeFuncCalls.py | 9 ++------- lldb/test/macosx/universal/TestUniversal.py | 11 +++-------- lldb/test/python_api/breakpoint/TestBreakpointAPI.py | 10 ++-------- .../class_members/TestSBTypeClassMembers.py | 9 ++------- .../TestDefaultConstructorForAPIObjects.py | 10 ++-------- .../disassemble-raw-data/TestDisassembleRawData.py | 9 ++------- .../disassemble-raw-data/TestDisassemble_VST1_64.py | 10 ++-------- lldb/test/python_api/event/TestEvents.py | 9 ++------- .../findvalue_duplist/TestSBFrameFindValue.py | 9 ++------- .../test/python_api/formatters/TestFormattersSBAPI.py | 10 ++-------- lldb/test/python_api/frame/TestFrames.py | 8 -------- .../test/python_api/frame/inlines/TestInlinedFrame.py | 9 ++------- lldb/test/python_api/function_symbol/TestDisasmAPI.py | 9 ++------- lldb/test/python_api/function_symbol/TestSymbolAPI.py | 10 ++-------- lldb/test/python_api/hello_world/TestHelloWorld.py | 9 ++------- .../interpreter/TestCommandInterpreterAPI.py | 10 ++-------- lldb/test/python_api/lldbutil/frame/TestFrameUtils.py | 10 ++-------- .../test/python_api/lldbutil/iter/TestLLDBIterator.py | 9 ++------- .../python_api/lldbutil/iter/TestRegistersIterator.py | 10 ++-------- .../lldbutil/process/TestPrintStackTraces.py | 10 ++-------- .../python_api/module_section/TestModuleAndSection.py | 9 ++------- lldb/test/python_api/objc_type/TestObjCType.py | 9 ++------- lldb/test/python_api/process/TestProcessAPI.py | 10 ++-------- lldb/test/python_api/process/io/TestProcessIO.py | 9 ++------- .../python_api/rdar-12481949/Test-rdar-12481949.py | 9 ++------- lldb/test/python_api/sbdata/TestSBData.py | 9 ++------- .../python_api/sbvalue_persist/TestSBValuePersist.py | 9 ++------- lldb/test/python_api/section/TestSectionAPI.py | 9 ++------- lldb/test/python_api/signals/TestSignalsAPI.py | 10 ++-------- .../python_api/symbol-context/TestSymbolContext.py | 10 ++-------- lldb/test/python_api/target/TestTargetAPI.py | 11 +++-------- lldb/test/python_api/thread/TestThreadAPI.py | 10 ++-------- lldb/test/python_api/type/TestTypeList.py | 9 ++------- lldb/test/python_api/value/TestValueAPI.py | 9 ++------- .../value/change_values/TestChangeValueAPI.py | 9 ++------- .../value/linked_list/TestValueAPILinkedList.py | 9 ++------- .../python_api/value_var_update/TestValueVarUpdate.py | 9 ++------- lldb/test/python_api/watchpoint/TestSetWatchpoint.py | 10 ++-------- .../watchpoint/TestWatchpointIgnoreCount.py | 10 ++-------- lldb/test/python_api/watchpoint/TestWatchpointIter.py | 10 ++-------- .../condition/TestWatchpointConditionAPI.py | 10 ++-------- .../watchpoint/watchlocation/TestSetWatchlocation.py | 10 ++-------- .../watchlocation/TestTargetWatchAddress.py | 10 ++-------- lldb/test/settings/TestSettings.py | 11 ++--------- lldb/test/settings/quoting/TestQuoting.py | 9 ++------- lldb/test/source-manager/TestSourceManager.py | 10 ++-------- lldb/test/terminal/TestSTTYBeforeAndAfter.py | 10 ++-------- lldb/test/tools/lldb-mi/TestMiExit.py | 6 ++---- lldb/test/tools/lldb-mi/TestMiFile.py | 6 ++---- lldb/test/tools/lldb-mi/TestMiGdbSetShow.py | 7 +++---- lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py | 6 ++---- lldb/test/tools/lldb-mi/TestMiPrompt.py | 6 ++---- lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py | 7 +++---- lldb/test/tools/lldb-mi/control/TestMiExec.py | 6 ++---- lldb/test/tools/lldb-mi/data/TestMiData.py | 7 +++---- .../tools/lldb-mi/interpreter/TestMiCliSupport.py | 6 ++---- .../lldb-mi/interpreter/TestMiInterpreterExec.py | 6 ++---- lldb/test/tools/lldb-mi/lldbmi_testcase.py | 3 ++- lldb/test/tools/lldb-mi/signal/TestMiSignal.py | 6 ++---- lldb/test/tools/lldb-mi/stack/TestMiStack.py | 6 ++---- .../lldb-mi/startup_options/TestMiStartupOptions.py | 6 ++---- lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py | 6 ++---- lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py | 6 ++---- lldb/test/tools/lldb-mi/target/TestMiTarget.py | 3 ++- .../tools/lldb-mi/variable/TestMiGdbSetShowPrint.py | 6 ++---- lldb/test/tools/lldb-mi/variable/TestMiVar.py | 6 ++---- .../test/tools/lldb-server/TestGDBRemoteMemoryRead.py | 10 ++-------- lldb/test/tools/lldb-server/TestGdbRemoteAttach.py | 7 ++----- .../tools/lldb-server/TestGdbRemoteAuxvSupport.py | 6 +----- .../lldb-server/TestGdbRemoteExpeditedRegisters.py | 6 +----- lldb/test/tools/lldb-server/TestGdbRemoteKill.py | 2 +- .../tools/lldb-server/TestGdbRemoteProcessInfo.py | 7 ++----- .../tools/lldb-server/TestGdbRemoteRegisterState.py | 6 +----- .../test/tools/lldb-server/TestGdbRemoteSingleStep.py | 5 +---- .../lldb-server/TestGdbRemoteThreadsInStopReply.py | 6 +----- .../lldb-server/TestGdbRemote_qThreadStopInfo.py | 10 ++++------ lldb/test/tools/lldb-server/TestGdbRemote_vCont.py | 6 +----- lldb/test/tools/lldb-server/TestLldbGdbServer.py | 8 +++----- .../lldb-server/commandline/TestStubReverseConnect.py | 4 ---- .../tools/lldb-server/commandline/TestStubSetSID.py | 2 +- lldb/test/tools/lldb-server/gdbremote_testcase.py | 3 ++- .../lldb-server/inferior-crash/TestGdbRemoteAbort.py | 2 +- .../inferior-crash/TestGdbRemoteSegFault.py | 2 +- .../tools/lldb-server/test/test_lldbgdbserverutils.py | 8 +++----- lldb/test/types/HideTestFailures.py | 9 ++------- lldb/test/types/TestFloatTypes.py | 9 ++------- lldb/test/types/TestFloatTypesExpr.py | 9 ++------- lldb/test/types/TestIntegerTypes.py | 10 ++-------- lldb/test/types/TestIntegerTypesExpr.py | 10 ++-------- lldb/test/types/TestRecursiveTypes.py | 9 ++------- lldb/test/warnings/uuid/TestAddDsymCommand.py | 10 ++-------- 396 files changed, 775 insertions(+), 2791 deletions(-) diff --git a/lldb/test/android/platform/TestDefaultCacheLineSize.py b/lldb/test/android/platform/TestDefaultCacheLineSize.py index f0cdab8a31bc..2cc209bacf46 100644 --- a/lldb/test/android/platform/TestDefaultCacheLineSize.py +++ b/lldb/test/android/platform/TestDefaultCacheLineSize.py @@ -2,8 +2,9 @@ Verify the default cache line size for android targets """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -33,9 +34,3 @@ class DefaultCacheLineSizeTestCase(TestBase): # Run to completion. process.Continue() self.assertEqual(process.GetState(), lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py index 46e554f5a39b..95f4bc9936cd 100644 --- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py +++ b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py @@ -6,7 +6,6 @@ should compile and link with the LLDB framework.""" import lldb_shared import os, re -import unittest2 from lldbtest import * import lldbutil @@ -87,9 +86,3 @@ class SBDirCheckerCase(TestBase): 'stop reason = breakpoint']) self.runCmd('frame variable') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py index 369a6b1147e1..d25ee1083831 100644 --- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py +++ b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py @@ -3,7 +3,6 @@ import lldb_shared import os, re -import unittest2 from lldbtest import * import lldbutil import lldb @@ -46,9 +45,3 @@ class TestMultipleSimultaneousDebuggers(TestBase): else: with open(os.devnull, 'w') as fnull: check_call([self.driver_exe, self.inferior_exe], env=env, stdout=fnull, stderr=fnull) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/api/multithreaded/TestMultithreaded.py b/lldb/test/api/multithreaded/TestMultithreaded.py index e7be1f342a73..2731a49d7b03 100644 --- a/lldb/test/api/multithreaded/TestMultithreaded.py +++ b/lldb/test/api/multithreaded/TestMultithreaded.py @@ -3,7 +3,6 @@ import lldb_shared import os, re -import unittest2 from lldbtest import * import lldbutil import subprocess @@ -91,9 +90,3 @@ class SBBreakpointCallbackCase(TestBase): def build_program(self, sources, program): return self.buildDriver(sources, program) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/arm_emulation/TestEmulations.py b/lldb/test/arm_emulation/TestEmulations.py index 0bd36f05a941..ec37760f5d41 100644 --- a/lldb/test/arm_emulation/TestEmulations.py +++ b/lldb/test/arm_emulation/TestEmulations.py @@ -2,8 +2,9 @@ Test some ARM instruction emulation. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -49,10 +50,3 @@ class ARMEmulationTestCase(TestBase): print output self.assertTrue (success, 'Emulation test succeeded.') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/benchmarks/continue/TestBenchmarkContinue.py index c4d0de34347d..83674c6ff240 100644 --- a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py +++ b/lldb/test/benchmarks/continue/TestBenchmarkContinue.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbbench import * import lldbutil @@ -61,9 +62,3 @@ class TestBenchmarkContinue(BenchBase): lldbutil_sw.stop() print "runCmd: %s\nlldbutil: %s" % (runCmd_sw,lldbutil_sw) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/disassembly/TestDisassembly.py b/lldb/test/benchmarks/disassembly/TestDisassembly.py index 83ed72ea3c96..b5148192b62a 100644 --- a/lldb/test/benchmarks/disassembly/TestDisassembly.py +++ b/lldb/test/benchmarks/disassembly/TestDisassembly.py @@ -1,7 +1,8 @@ """Disassemble lldb's Driver::MainLoop() functions comparing lldb against gdb.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -151,10 +152,3 @@ class DisassembleDriverMainLoop(BenchBase): if self.TraceOn(): print "gdb disassembly benchmark:", str(self.stopwatch) self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py index 0f06497023ec..a93a406f90fe 100644 --- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py +++ b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py @@ -2,8 +2,9 @@ inferior and traverses the stack for thread0 to arrive at frame with function 'MainLoop'. It is important to specify an lldb executable as the inferior.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -66,10 +67,3 @@ class AttachThenDisassemblyBench(BenchBase): with self.stopwatch: # Disassemble the function. self.runCmd("disassemble -f") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py index ff79866de129..393119e1d841 100644 --- a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py +++ b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py @@ -1,7 +1,8 @@ """Disassemble lldb's Driver::MainLoop() functions comparing Xcode 4.1 vs. 4.2's gdb.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -90,10 +91,3 @@ class XCode41Vs42GDBDisassembly(BenchBase): if self.TraceOn(): print "gdb disassembly benchmark:", str(self.stopwatch) self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/expression/TestExpressionCmd.py b/lldb/test/benchmarks/expression/TestExpressionCmd.py index a9d26499eb28..aa7b03f2ffb7 100644 --- a/lldb/test/benchmarks/expression/TestExpressionCmd.py +++ b/lldb/test/benchmarks/expression/TestExpressionCmd.py @@ -1,7 +1,8 @@ """Test lldb's expression evaluations and collect statistics.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -68,10 +69,3 @@ class ExpressionEvaluationCase(BenchBase): pass self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/benchmarks/expression/TestRepeatedExprs.py index ad8f963ba9ef..9efbec6c859e 100644 --- a/lldb/test/benchmarks/expression/TestRepeatedExprs.py +++ b/lldb/test/benchmarks/expression/TestRepeatedExprs.py @@ -1,7 +1,8 @@ """Test evaluating expressions repeatedly comparing lldb against gdb.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -126,10 +127,3 @@ class RepeatedExprsCase(BenchBase): if self.TraceOn(): print "gdb expression benchmark:", str(self.stopwatch) self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py index b3eb7b651f50..ff55ecda989e 100644 --- a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py +++ b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py @@ -1,7 +1,8 @@ """Test lldb's response time for 'frame variable' command.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -72,10 +73,3 @@ class FrameVariableResponseBench(BenchBase): # The test is about to end and if we come to here, the child process has # been terminated. Mark it so. self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/startup/TestStartupDelays.py b/lldb/test/benchmarks/startup/TestStartupDelays.py index 802a8858673d..b921906ce310 100644 --- a/lldb/test/benchmarks/startup/TestStartupDelays.py +++ b/lldb/test/benchmarks/startup/TestStartupDelays.py @@ -1,7 +1,8 @@ """Test lldb's startup delays creating a target, setting a breakpoint, and run to breakpoint stop.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -82,10 +83,3 @@ class StartupDelaysBench(BenchBase): # The test is about to end and if we come to here, the child process has # been terminated. Mark it so. self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py index 623e2c081b33..71017eb3e347 100644 --- a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py +++ b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py @@ -1,7 +1,8 @@ """Test lldb's stepping speed.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -59,10 +60,3 @@ class RunHooksThenSteppingsBench(BenchBase): pass self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py index 7aa84c6fe5d3..553933f1ee62 100644 --- a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py +++ b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py @@ -1,7 +1,8 @@ """Test lldb's stepping speed.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -71,10 +72,3 @@ class SteppingSpeedBench(BenchBase): pass self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py index ab57a7040220..c359ab256e2a 100644 --- a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py +++ b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py @@ -1,7 +1,8 @@ """Benchmark the turnaround time starting a debugger and run to the breakpont with lldb vs. gdb.""" +import lldb_shared + import os, sys -import unittest2 import lldb from lldbbench import * @@ -116,10 +117,3 @@ class CompileRunToBreakpointBench(BenchBase): self.gdb_avg = self.stopwatch.avg() self.child = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/driver/batch_mode/TestBatchMode.py b/lldb/test/driver/batch_mode/TestBatchMode.py index 733cfe65db57..bd0f3fa4432b 100644 --- a/lldb/test/driver/batch_mode/TestBatchMode.py +++ b/lldb/test/driver/batch_mode/TestBatchMode.py @@ -2,13 +2,10 @@ Test that the lldb driver's batch mode works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb -try: - import pexpect -except: - pexpect = None from lldbtest import * class DriverBatchModeTest (TestBase): @@ -31,6 +28,7 @@ class DriverBatchModeTest (TestBase): self.source = 'main.c' def expect_string (self, string): + import pexpect """This expects for "string", with timeout & EOF being test fails.""" try: self.child.expect_exact(string) @@ -40,6 +38,7 @@ class DriverBatchModeTest (TestBase): self.fail ("Timed out waiting for '%s'"%(string)) def batch_mode (self): + import pexpect exe = os.path.join(os.getcwd(), "a.out") prompt = "(lldb) " diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py index ca09285858e0..736af5b63340 100644 --- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py +++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py @@ -2,7 +2,8 @@ Test calling std::String member functions. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -38,9 +39,3 @@ class ExprCommandCallFunctionTestCase(TestBase): # const char *, and thus don't invoke the Summary formatter. self.expect("print str.c_str()", substrs = ['Hello world']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py index 1f34ad3addca..10a4c21d0a89 100644 --- a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py +++ b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py @@ -2,7 +2,8 @@ Test calling a function, stopping in the call, continue and gather the result on stop. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -41,9 +42,3 @@ class ExprCommandCallStopContinueTestCase(TestBase): self.expect ("thread list", substrs = ['stop reason = User Expression thread plan', r'Completed expression: (Five) $0 = (number = 5, name = "five")']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py index c71f901d69f4..c9a1db2b427e 100644 --- a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py +++ b/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py @@ -7,7 +7,8 @@ Note: """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -47,10 +48,3 @@ class ExprCommandCallUserDefinedFunction(TestBase): # Test function with pointer paramter self.expect("exp stringCompare((const char*) \"Hello world\")", substrs = ['$4 = true']) self.expect("exp stringCompare((const char*) \"Hellworld\")", substrs = ['$5 = false']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py index 289341e5df88..f5480c27407f 100644 --- a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py +++ b/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py @@ -2,7 +2,8 @@ Test calling a function that hits a signal set to auto-restart, make sure the call completes. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -134,9 +135,3 @@ class ExprCommandThatRestartsTestCase(TestBase): frame = self.thread.GetFrameAtIndex(0) self.assertTrue (frame.GetPC() == self.orig_frame_pc, "Continuing returned to the place we started.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/test/expression_command/call-throws/TestCallThatThrows.py index 7d99d0527747..e5ac994d7b51 100644 --- a/lldb/test/expression_command/call-throws/TestCallThatThrows.py +++ b/lldb/test/expression_command/call-throws/TestCallThatThrows.py @@ -2,7 +2,8 @@ Test calling a function that throws an ObjC exception, make sure that it doesn't propagate the exception. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -107,9 +108,3 @@ class ExprCommandWithThrowTestCase(TestBase): self.assertTrue (value.IsValid() and value.GetError().Success() == False) self.check_after_call() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/char/TestExprsChar.py b/lldb/test/expression_command/char/TestExprsChar.py index 0a8319f95cb3..c5745189d564 100644 --- a/lldb/test/expression_command/char/TestExprsChar.py +++ b/lldb/test/expression_command/char/TestExprsChar.py @@ -1,4 +1,5 @@ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -64,9 +65,3 @@ class ExprCharTestCase(TestBase): @expectedFailureWindows("llvm.org/pr21765") def test_unsigned_char(self): self.do_test(dictionary={'CFLAGS_EXTRAS': '-funsigned-char'}) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py index c8a97c70b933..4d1ba4bec59e 100644 --- a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py +++ b/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py @@ -1,7 +1,8 @@ """Test that we are able to evaluate expressions when the inferior is blocked in a syscall""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -77,9 +78,3 @@ class ExprSyscallTestCase(TestBase): self.assertEqual(process.GetState(), lldb.eStateExited) self.assertEqual(process.GetExitStatus(), 0) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/formatters/TestFormatters.py b/lldb/test/expression_command/formatters/TestFormatters.py index 12cf3e12871a..a86961a32b88 100644 --- a/lldb/test/expression_command/formatters/TestFormatters.py +++ b/lldb/test/expression_command/formatters/TestFormatters.py @@ -2,7 +2,8 @@ Test using LLDB data formatters with frozen objects coming from the expression parser. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -162,9 +163,3 @@ class ExprFormattersTestCase(TestBase): self.assertTrue(a_data.GetUnsignedInt32(error, 8) == 3, 'numbers[2] == 3') self.assertTrue(a_data.GetUnsignedInt32(error, 12) == 4, 'numbers[3] == 4') self.assertTrue(a_data.GetUnsignedInt32(error, 16) == 5, 'numbers[4] == 5') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/issue_11588/Test11588.py b/lldb/test/expression_command/issue_11588/Test11588.py index be631ed1d7db..d1793c3f96fe 100644 --- a/lldb/test/expression_command/issue_11588/Test11588.py +++ b/lldb/test/expression_command/issue_11588/Test11588.py @@ -4,8 +4,9 @@ valobj.AddressOf() returns None when an address is expected in a SyntheticChildrenProvider """ +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -72,10 +73,3 @@ class Issue11581TestCase(TestBase): "load_address = ", hex(addr)[2:].rstrip("L"), str(addr)]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/options/TestExprOptions.py b/lldb/test/expression_command/options/TestExprOptions.py index ae9dcf64277b..18394efc0105 100644 --- a/lldb/test/expression_command/options/TestExprOptions.py +++ b/lldb/test/expression_command/options/TestExprOptions.py @@ -7,8 +7,9 @@ o test_expr_options: Test expression command options. """ +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -71,9 +72,3 @@ class ExprOptionsTestCase(TestBase): val = frame.EvaluateExpression('foo != nullptr', options) self.assertTrue(val.IsValid()) self.assertFalse(val.GetError().Success()) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py index f58ccc1706b9..a179205a2d96 100644 --- a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py +++ b/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py @@ -2,7 +2,8 @@ Test that we can p *objcObject """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -45,9 +46,3 @@ class PersistObjCPointeeType(TestBase): '_sc_name6 = nil', '_sc_name7 = nil', '_sc_name8 = nil']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py index 6ea706a0bcba..312d9de6d106 100644 --- a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py +++ b/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py @@ -2,7 +2,8 @@ Test that we can have persistent pointer variables """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -36,9 +37,3 @@ class PersistentPtrUpdateTestCase(TestBase): self.runCmd("continue") self.expect("expr $foo", substrs=['$foo','0x0']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py index b9269058f37a..4fd34830a751 100644 --- a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py +++ b/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py @@ -2,8 +2,9 @@ Test that nested persistent types work. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -36,9 +37,3 @@ class NestedPersistentTypesTestCase(TestBase): self.expect("expression $my_bar.end.b", substrs = ['(int)', '5']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py index 7f0eb648bbd2..0ced77007270 100644 --- a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py +++ b/lldb/test/expression_command/persistent_types/TestPersistentTypes.py @@ -2,8 +2,9 @@ Test that lldb persistent types works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -52,10 +53,3 @@ class PersistenttypesTestCase(TestBase): self.expect("expression struct A { int x; int y; }; struct { struct A a; int z; } object; object.a.y = 1; object.z = 3; object.a.x = 2; object", substrs = ['x = 2', 'y = 1', 'z = 3']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py index 77d1c251915e..3a10a98475c8 100644 --- a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py +++ b/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py @@ -2,8 +2,9 @@ Test that lldb persistent variables works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -49,9 +50,3 @@ class PersistentVariablesTestCase(TestBase): self.expect("expression (long)$4", startstr = "(long) $6 = -2") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py index 2a9ed7c9779a..829b35dd091a 100644 --- a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py +++ b/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py @@ -2,7 +2,8 @@ Test that the po command acts correctly. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -56,10 +57,3 @@ class PoVerbosityTestCase(TestBase): self.expect("expr -O -v -- 22", substrs = ['(int) $', ' = 22']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/radar_8638051/Test8638051.py b/lldb/test/expression_command/radar_8638051/Test8638051.py index fa1f1756dba8..2cff7fe13fc1 100644 --- a/lldb/test/expression_command/radar_8638051/Test8638051.py +++ b/lldb/test/expression_command/radar_8638051/Test8638051.py @@ -2,8 +2,9 @@ Test the robustness of lldb expression parser. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -34,10 +35,3 @@ class Radar8638051TestCase(TestBase): self.expect("expression &val", startstr = "(int *) $2 = ") # (int *) $2 = 0x.... - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py index 0a1a9b81ffe5..31d120fccef9 100644 --- a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py +++ b/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py @@ -2,8 +2,9 @@ The evaluating printf(...) after break stop and then up a stack frame. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -37,10 +38,3 @@ class Radar9531204TestCase(TestBase): # This does not currently. self.runCmd('expression (int)printf("argc is: %d.\\n", argc)') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py index 58f04554ed66..c412bce7c49b 100644 --- a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py +++ b/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py @@ -2,8 +2,9 @@ Test example snippets from the lldb 'help expression' output. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -36,10 +37,3 @@ class Radar9673644TestCase(TestBase): substrs = ["'f'"]) # runCmd: expr char c[] = "foo"; c[0] # output: (char) $0 = 'f' - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/test/TestExprs.py b/lldb/test/expression_command/test/TestExprs.py index 3545e34e74a0..12bdfa24d6c8 100644 --- a/lldb/test/expression_command/test/TestExprs.py +++ b/lldb/test/expression_command/test/TestExprs.py @@ -11,8 +11,11 @@ o test_expr_commands_can_handle_quotes: Throw some expression commands with quotes at lldb. """ -import os, time +import lldb_shared + import unittest2 + +import os, time import lldb import lldbutil from lldbtest import * @@ -243,9 +246,3 @@ class BasicExprCommandsTestCase(TestBase): self.expect('print_hi', substrs = ['(int) $', '6']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/test/TestExprs2.py b/lldb/test/expression_command/test/TestExprs2.py index 5e52c5e94de6..a2dd98cfbce8 100644 --- a/lldb/test/expression_command/test/TestExprs2.py +++ b/lldb/test/expression_command/test/TestExprs2.py @@ -2,8 +2,9 @@ Test some more expression commands. """ +import lldb_shared + import os -import unittest2 import lldb import lldbutil from lldbtest import * @@ -55,10 +56,3 @@ class ExprCommands2TestCase(TestBase): self.expect("expression $4 + 1", startstr = "(int) $5 = 24") # (int) $5 = 6 - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/test/expression_command/timeout/TestCallWithTimeout.py index f59cd7564dcc..e63cebede523 100644 --- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py +++ b/lldb/test/expression_command/timeout/TestCallWithTimeout.py @@ -2,7 +2,8 @@ Test calling a function that waits a while, and make sure the timeout option to expr works. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -87,10 +88,3 @@ class ExprCommandWithTimeoutsTestCase(TestBase): value = frame.EvaluateExpression ("wait_a_while (1000)", options) self.assertTrue(value.IsValid()) self.assertTrue (value.GetError().Success() == True) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py index 8279a75684ed..93c8218c4b98 100644 --- a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py +++ b/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py @@ -4,7 +4,8 @@ Regression test for : The expression parser's type search only looks in the current compilation unit for types. """ -import unittest2 +import lldb_shared + import lldb from lldbtest import * import lldbutil @@ -34,10 +35,3 @@ class ObjCTypeQueryTestCase(TestBase): self.expect("expression (NSArray*)array_token", substrs = ['(NSArray *) $0 = 0x']) # (NSArray *) $0 = 0x00007fff70118398 - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index d0bbd15b7498..86268bba1a25 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -2,8 +2,9 @@ Test some lldb command abbreviations and aliases for proper resolution. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -96,11 +97,3 @@ class AbbreviationsTestCase(TestBase): #self.runCmd("se cl prompt") #self.expect("set sh prompt", # startstr = 'prompt (string) = "(lldb) "') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py index 5f7e84df40ca..d184edc65729 100644 --- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py +++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py @@ -3,8 +3,9 @@ Test some lldb command abbreviations to make sure the common short spellings of many commands remain available even after we add/delete commands in the future. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -33,11 +34,3 @@ class CommonShortSpellingsTestCase(TestBase): command_interpreter.ResolveCommand(short, result) self.assertTrue(result.Succeeded()) self.assertEqual(long, result.GetOutput()) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/archives/TestBSDArchives.py b/lldb/test/functionalities/archives/TestBSDArchives.py index 0404e25a39e5..9246c5eaf58b 100644 --- a/lldb/test/functionalities/archives/TestBSDArchives.py +++ b/lldb/test/functionalities/archives/TestBSDArchives.py @@ -1,7 +1,8 @@ """Test breaking inside functions defined within a BSD archive file libfoo.a.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -52,10 +53,3 @@ class BSDArchivesTestCase(TestBase): substrs = ['(int) arg = 2']) self.expect("frame variable __b_global", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['(int) __b_global = 2']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/asan/TestMemoryHistory.py b/lldb/test/functionalities/asan/TestMemoryHistory.py index 541c1c5fa141..d9334d5f2a23 100644 --- a/lldb/test/functionalities/asan/TestMemoryHistory.py +++ b/lldb/test/functionalities/asan/TestMemoryHistory.py @@ -2,8 +2,9 @@ Test that ASan memory history provider returns correct stack traces """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -102,9 +103,3 @@ class AsanTestCase(TestBase): self.expect("memory history 'another_pointer'", substrs = [ 'Memory allocated at', 'a.out`f1', 'main.c:%d' % self.line_malloc2]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/asan/TestReportData.py b/lldb/test/functionalities/asan/TestReportData.py index cfa0141dd365..19e0b61498ac 100644 --- a/lldb/test/functionalities/asan/TestReportData.py +++ b/lldb/test/functionalities/asan/TestReportData.py @@ -2,8 +2,9 @@ Test the AddressSanitizer runtime support for report breakpoint and data extraction. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -78,9 +79,3 @@ class AsanTestReportDataCase(TestBase): s = s.GetData() data2 = json.loads(s) self.assertEqual(data, data2) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/attach_resume/TestAttachResume.py b/lldb/test/functionalities/attach_resume/TestAttachResume.py index c03d7d756856..0a5e7f20eab0 100644 --- a/lldb/test/functionalities/attach_resume/TestAttachResume.py +++ b/lldb/test/functionalities/attach_resume/TestAttachResume.py @@ -2,8 +2,9 @@ Test process attach/resume. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -66,9 +67,3 @@ class AttachResumeTestCase(TestBase): # make sure to detach while in running state (r204759) self.runCmd("detach") lldbutil.expect_state_changes(self, listener, [lldb.eStateDetached]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py index c28221a7f90f..abceb6a3ca47 100644 --- a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py +++ b/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py @@ -2,8 +2,9 @@ Test whether a process started by lldb has no extra file descriptors open. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -70,10 +71,3 @@ class AvoidsFdLeakTestCase(TestBase): self.assertTrue(process2.GetState() == lldb.eStateExited, "Process should have exited.") self.assertTrue(process2.GetExitStatus() == 0, "Process returned non-zero status. Were incorrect file descriptors passed?") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py index 7d9be6752925..d2a6e5ce87e6 100644 --- a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py +++ b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py @@ -2,8 +2,9 @@ Test that backticks without a target should work (not infinite looping). """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -16,9 +17,3 @@ class BackticksWithNoTargetTestCase(TestBase): """A simple test of backticks without a target.""" self.expect("print `1+2-3`", substrs = [' = 0']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index d6a9f70baa94..660f463ee90e 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -2,8 +2,9 @@ Test lldb breakpoint command add/list/delete. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -201,9 +202,3 @@ class BreakpointCommandTestCase(TestBase): # Now remove 'output-2.txt' os.remove ('output-2.txt') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py index c7bc773d4d59..0058bff9d803 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py @@ -2,9 +2,10 @@ Test that you can set breakpoint commands successfully with the Python API's: """ +import lldb_shared + import os import re -import unittest2 import lldb, lldbutil import sys from lldbtest import * @@ -89,10 +90,3 @@ print 'Hit breakpoint'") self.assertTrue(os.path.isfile("output2.txt"), "'output2.txt' exists due to breakpoint command for breakpoint function.") self.RemoveTempFile("output2.txt") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py index e5fda67c212b..2e2eac98aa4f 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py @@ -2,8 +2,9 @@ Test _regexp-break command which uses regular expression matching to dispatch to other built in breakpoint commands. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -46,10 +47,3 @@ class RegexpBreakCommandTestCase(TestBase): self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, substrs = ['stopped', 'stop reason = breakpoint']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py index 1aa01542075a..2c3090436e3e 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py @@ -2,9 +2,10 @@ Test breakpoint conditions with 'breakpoint modify -c id'. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -172,10 +173,3 @@ class BreakpointConditionsTestCase(TestBase): self.assertTrue(breakpoint.GetHitCount() == 1) process.Continue() - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py index efab6fba918e..effd1ef22314 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py @@ -2,8 +2,9 @@ Test lldb breakpoint ids. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -46,10 +47,3 @@ class BreakpointIDTestCase(TestBase): self.expect ("breakpoint enable 2.*", patterns = [ ".* breakpoints enabled."] ) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py index 6daa68d8a459..690d35da4249 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py @@ -2,9 +2,10 @@ Test breakpoint ignore count features. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -130,10 +131,3 @@ class BreakpointIgnoreCountTestCase(TestBase): self.assertTrue(breakpoint.GetHitCount() == 3) process.Continue() - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py index 9e118406dbcf..e992df3dcd59 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py @@ -2,8 +2,9 @@ Test breakpoint commands for a breakpoint ID with multiple locations. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -83,10 +84,3 @@ class BreakpointLocationsTestCase(TestBase): patterns = ["1\.1: .+ unresolved, hit count = 0 +Options: disabled", "1\.2: .+ resolved, hit count = 1", "1\.3: .+ resolved, hit count = 1"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py index b71fbabea7ef..a2545adebb56 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py @@ -2,8 +2,9 @@ Test breakpoint command for different options. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -88,9 +89,3 @@ class BreakpointOptionsTestCase(TestBase): # We should exit. self.expect("process status", "Process exited successfully", patterns = ["^Process [0-9]+ exited with status = 0"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py index ba2a54932e94..809a7944503c 100644 --- a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py +++ b/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py @@ -1,8 +1,9 @@ """ Test breakpoint command with AT_comp_dir set to symbolic link. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -58,10 +59,3 @@ class CompDirSymLinkTestCase(TestBase): exe = os.path.join(os.getcwd(), _EXE_NAME) self.runCmd('file ' + exe, CURRENT_EXECUTABLE_SET) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py b/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py index 5f94352953a4..103b38c76246 100644 --- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py @@ -2,6 +2,8 @@ Test continue from a breakpoint when there is a breakpoint on the next instruction also. """ +import lldb_shared + import unittest2 import lldb, lldbutil from lldbtest import * @@ -61,10 +63,3 @@ class ConsecutiveBreakpoitsTestCase(TestBase): # Run the process until termination process.Continue() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py index 23ccbb54078e..fb27df1a11ae 100644 --- a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py +++ b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py @@ -2,8 +2,9 @@ Test lldb breakpoint ids. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -57,11 +58,3 @@ class TestCPPBreakpointLocations(TestBase): for bp_dict in bp_dicts: self.verify_breakpoint_locations(target, bp_dict) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py index aa52a2cf1a59..e01bdb4828dd 100644 --- a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py +++ b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py @@ -2,9 +2,10 @@ Test that you can set breakpoint and hit the C++ language exception breakpoint """ +import lldb_shared + import os import re -import unittest2 import lldb, lldbutil import sys from lldbtest import * @@ -42,9 +43,3 @@ class TestCPPExceptionBreakpoint (TestBase): thread_list = lldbutil.get_threads_stopped_at_breakpoint (process, exception_bkpt) self.assertTrue (len(thread_list) == 1, "One thread stopped at the exception breakpoint.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py index 65197ed52908..da62c9dc7545 100644 --- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py +++ b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py @@ -2,8 +2,9 @@ Test breakpoint commands set before we have a target """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -62,9 +63,3 @@ class BreakpointInDummyTarget (TestBase): # Stopped again. self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT, substrs = ["stop reason = breakpoint 2."]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py index 5681b1281c7c..d12b39d1cb75 100644 --- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py @@ -3,8 +3,9 @@ Test that inlined breakpoints (breakpoint set on a file/line included from another source file) works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -52,10 +53,3 @@ class InlinedBreakpointsTestCase(TestBase): substrs = ['stopped', 'stop reason = breakpoint', 'basic_type.cpp:%d' % self.line]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py index 6feb31a13fee..b61132d5e329 100644 --- a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py @@ -3,8 +3,9 @@ Test that objective-c constant strings are generated correctly by the expression parser. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -89,9 +90,3 @@ class TestObjCBreakpoints(TestBase): # Check breakpoints again, this time using the symbol table only self.check_category_breakpoints() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/command_history/TestCommandHistory.py b/lldb/test/functionalities/command_history/TestCommandHistory.py index 6cca992ced34..3022433a5942 100644 --- a/lldb/test/functionalities/command_history/TestCommandHistory.py +++ b/lldb/test/functionalities/command_history/TestCommandHistory.py @@ -2,8 +2,9 @@ Test the command history mechanism """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -63,10 +64,3 @@ class CommandHistoryTestCase(TestBase): self.expect ("command history -c 1 -e 3 -s 5",error=True, inHistory=True, substrs = ['error: --count, --start-index and --end-index cannot be all specified in the same invocation']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/command_regex/TestCommandRegex.py b/lldb/test/functionalities/command_regex/TestCommandRegex.py index 93c0aa4fed5a..5400b547fcea 100644 --- a/lldb/test/functionalities/command_regex/TestCommandRegex.py +++ b/lldb/test/functionalities/command_regex/TestCommandRegex.py @@ -2,8 +2,9 @@ Test lldb 'commands regex' command which allows the user to create a regular expression command. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -51,9 +52,3 @@ class CommandRegexTestCase(TestBase): child.sendline('Help__') child.expect_exact("error: 'Help__' is not a valid command") child.expect_exact(prompt) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/command_script/TestCommandScript.py b/lldb/test/functionalities/command_script/TestCommandScript.py index 40d0b694fa9f..b8a891630c3d 100644 --- a/lldb/test/functionalities/command_script/TestCommandScript.py +++ b/lldb/test/functionalities/command_script/TestCommandScript.py @@ -2,8 +2,9 @@ Test lldb Python commands. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -137,10 +138,3 @@ class CmdPythonTestCase(TestBase): self.runCmd('command script add -f bug11569 bug11569') # This should not crash. self.runCmd('bug11569', check=False) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/command_script/import/TestImport.py b/lldb/test/functionalities/command_script/import/TestImport.py index a00db8e7dfe3..f413bdc4baa9 100644 --- a/lldb/test/functionalities/command_script/import/TestImport.py +++ b/lldb/test/functionalities/command_script/import/TestImport.py @@ -1,7 +1,8 @@ """Test custom import command to import files by path.""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * @@ -68,10 +69,3 @@ class ImportTestCase(TestBase): substrs = ['barutil says', 'bar told me', 'hello']) self.expect("foobarcmd hello", substrs = ['foobar says', 'hello']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py index 17368197e0b8..4b19386379b4 100644 --- a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py +++ b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py @@ -1,7 +1,8 @@ """Check that we handle an ImportError in a special way when command script importing files.""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * @@ -26,9 +27,3 @@ class Rdar12586188TestCase(TestBase): error=True, substrs = ['raise ImportError("I do not want to be imported")']) self.expect("command script import ./fail212586188.py --allow-reload", error=True, substrs = ['raise ValueError("I do not want to be imported")']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/command_source/TestCommandSource.py b/lldb/test/functionalities/command_source/TestCommandSource.py index 122d4c69d887..22f8ff747980 100644 --- a/lldb/test/functionalities/command_source/TestCommandSource.py +++ b/lldb/test/functionalities/command_source/TestCommandSource.py @@ -4,8 +4,9 @@ Test that lldb command "command source" works correctly. See also http://llvm.org/viewvc/llvm-project?view=rev&revision=109673. """ +import lldb_shared + import os, sys -import unittest2 import lldb from lldbtest import * @@ -31,10 +32,3 @@ class CommandSourceTestCase(TestBase): self.expect(result.GetOutput(), "script my.date() runs successfully", exe=False, substrs = [str(datetime.date.today())]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/completion/TestCompletion.py b/lldb/test/functionalities/completion/TestCompletion.py index fa2c427a5889..f2c5302a7d42 100644 --- a/lldb/test/functionalities/completion/TestCompletion.py +++ b/lldb/test/functionalities/completion/TestCompletion.py @@ -2,8 +2,9 @@ Test the lldb command line completion mechanism. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -318,10 +319,3 @@ class CommandLineCompletionTestCase(TestBase): else: self.expect(from_child, msg=COMPLETION_MSG(str_input, p), exe=False, patterns = [p]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py index 4ca3a010550b..f077bcdc919f 100644 --- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py +++ b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py @@ -2,9 +2,10 @@ Test conditionally break on a function and inspect its variables. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -128,11 +129,3 @@ class ConditionalBreakTestCase(TestBase): self.runCmd("frame select 1") self.expect("frame info", "The immediate caller should be a()", substrs = ["a.out`a"]) - - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py index 4464ba0b1278..ed73ccc05376 100644 --- a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py +++ b/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -67,10 +68,3 @@ class DataFormatterBoolRefPtr(TestBase): substrs = ['YES']) self.expect('frame variable no', substrs = ['NO']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py index eeb5ffbcff15..9fd66a0148dd 100644 --- a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py +++ b/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -53,9 +54,3 @@ class CompactVectorsFormattingTestCase(TestBase): '(vSInt16) valueS16 = (1, 0, 4, 0, 0, 1, 0, 4)', '(vSInt32) valueS32 = (4, 3, 2, 1)', '(vBool32) valueBool32 = (0, 1, 0, 1)']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py index 97dcb7447b8b..f645febe7511 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -280,10 +281,3 @@ class AdvDataFormatterTestCase(TestBase): 'o_2']) self.expect('frame variable a_long_guy --show-all-children', matching=False, substrs = ['...']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py index 6aa51e012b80..a367e391a6ef 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -321,9 +322,3 @@ class CategoriesDataFormatterTestCase(TestBase): self.expect('frame variable r2', substrs = ['w = 9', 'h = 16']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py index 259abc030f29..f2911eccd345 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -260,9 +261,3 @@ class CppDataFormatterTestCase(TestBase): self.expect("frame variable iAmInt --format hex", substrs = ['(int) iAmInt = 0x00000001']) self.expect("frame variable iAmInt", matching=False, substrs = ['(int) iAmInt = 0x00000001']) self.expect("frame variable iAmInt", substrs = ['(int) iAmInt = 1']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py index e15f17d82ff1..7be7276a918b 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -75,10 +76,3 @@ class DataFormatterDisablingTestCase(TestBase): # last check - our cleanup will re-enable everything self.runCmd('type category disable *') self.expect('type category list', substrs = ['system','disabled']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py index 4c3d390025a2..e004e59ca1b6 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -60,9 +61,3 @@ class EnumFormatTestCase(TestBase): '(int) y = Case45', '(int) z = 43' ]); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py index 44ed11b0ed38..d81891c4ff24 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -62,10 +63,3 @@ class GlobalsDataFormatterTestCase(TestBase): self.expect("target variable g_point_pointer", substrs = ['(Point *) g_point_pointer =']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py index 12f59b7c2de6..516c54e593f1 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -117,10 +118,3 @@ class NamedSummariesDataFormatterTestCase(TestBase): self.expect("frame variable first",matching=False, substrs = ['FirstAndFriends: x=12', 'y=34']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index eced5a13b777..c7ee9f6bf2e5 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -3,8 +3,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -459,9 +460,3 @@ class ObjCDataFormatterTestCase(TestBase): self.runCmd("continue") self.expect("frame variable _cmd",substrs = ['setAtoms:']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py index fb0442957ce2..2778035d1492 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py @@ -3,8 +3,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -102,10 +103,3 @@ class NSStringDataFormatterTestCase(TestBase): self.expect('po strwithNULs2', substrs=['a very much boring task to write']) self.expect('expr [strwithNULs2 length]', substrs=['52']) self.expect('frame variable strwithNULs2', substrs=['@"a very much boring task to write\\0a string this way!!']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py index e8b915f29c75..30d132318832 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -85,10 +86,3 @@ class DataFormatterOneIsSingularTestCase(TestBase): substrs = ['1 byte']) self.expect('frame variable immutableData', matching=False, substrs = ['1 bytes']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py index 172cfdd1a8d5..84cb74bcee17 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -52,10 +53,3 @@ class PtrToArrayDataFormatterTestCase(TestBase): substrs = ['01 00 00 00 02 00 00 00 03 00 00 00']) self.expect('p *(int (*)[3])foo', matching=False, substrs = ['0x000000030000000200000001']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py index f6a3e2d14d42..39e363a986d7 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -247,10 +248,3 @@ class PythonSynthDataFormatterTestCase(TestBase): self.assertTrue(str_cast.find('T') != -1, 'could not find T in output') self.assertTrue(str_cast.find('F') != -1, 'could not find F in output') self.assertTrue(str_cast.find("4 = '\\0'") != -1, 'could not find item 4 == 0') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py index 4eecda472c0a..b025ba0dbd8c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -165,10 +166,3 @@ class ScriptDataFormatterTestCase(TestBase): self.expect("frame variable array", substrs = ['Python summary']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py index 5ef92574c51b..03e713e5569a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -170,10 +171,3 @@ class SkipSummaryDataFormatterTestCase(TestBase): substrs = ['(DeepData_5) data2.m_child4.m_child2.m_child2 = {', 'm_some_text = "Just a test"', '}']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py index e4eb325bbccd..bb0e4e571aed 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -343,10 +344,3 @@ class SmartArrayDataFormatterTestCase(TestBase): substrs = ['intarr = arr = ', '09 00 00 00', '....,07 00 00 00']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py index 7abb6eded71c..24878443d108 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -35,9 +36,3 @@ class InitializerListTestCase(TestBase): self.expect("frame variable ils", substrs = ['[4] = "surprise it is a long string!! yay!!"']) self.expect('image list', substrs = self.getLibcPlusPlusLibs()) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py index 82ff6d131bbc..8781f45faae8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -61,9 +62,3 @@ class LibcxxIteratorDataFormatterTestCase(TestBase): self.expect('frame variable svI', substrs = ['item = "hello"']) self.expect('expr svI', substrs = ['item = "hello"']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py index 3390ae3d01c7..9f7d2947fd6d 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time, re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -181,9 +182,3 @@ class LibcxxListDataFormatterTestCase(TestBase): self.assertTrue(countingList.GetChildAtIndex(0).GetValueAsUnsigned(0) == 3141, "uniqued list[0] == 3141") self.assertTrue(countingList.GetChildAtIndex(1).GetValueAsUnsigned(0) == 3142, "uniqued list[1] == 3142") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py index f89369c4c199..1681e32a4ff3 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py @@ -3,8 +3,9 @@ Test that the debugger handles loops in std::list (which can appear as a result corruption). """ +import lldb_shared + import os, time, re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -48,9 +49,3 @@ class LibcxxListDataFormatterTestCase(TestBase): # Run to completion. process.Continue() self.assertEqual(process.GetState(), lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py index 25565bf40456..54406bd547f4 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -293,9 +294,3 @@ class LibcxxMapDataFormatterTestCase(TestBase): self.expect('frame variable ss', substrs = ['size=0', '{}']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py index ebd74fb839f8..d7f1f7dcb016 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -293,9 +294,3 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): self.expect('frame variable ss', substrs = ['size=0', '{}']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py index 68d1c9e77ede..da59ee51f64a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -64,9 +65,3 @@ class LibcxxMultiSetDataFormatterTestCase(TestBase): self.expect("frame variable ss[2]",substrs = [' = "b"']) lldbutil.continue_to_breakpoint(self.process(), bkpt) self.expect("frame variable ss",substrs = ["size=3",'[0] = "a"','[1] = "a very long string is right here"','[2] = "c"']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py index e6ceff983b50..c775b28ef779 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -64,9 +65,3 @@ class LibcxxSetDataFormatterTestCase(TestBase): self.expect("frame variable ss[2]",substrs = [' = "b"']) lldbutil.continue_to_breakpoint(self.process(), bkpt) self.expect("frame variable ss",substrs = ["size=3",'[0] = "a"','[1] = "a very long string is right here"','[2] = "c"']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py index ee050cdfd567..c69bab5a9120 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -3,8 +3,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -81,9 +82,3 @@ class LibcxxStringDataFormatterTestCase(TestBase): '(std::__1::string) Q = "quite a long std::strin with lots of info inside it"', '(std::__1::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"', '(std::__1::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0てざ ル゜䋨ミ㠧槊 きゅへ狦穤襩 じゃ馩リョ 䤦監"']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py index 04caa51b98c5..cd8172bbde1f 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -70,9 +71,3 @@ class LibcxxUnorderedDataFormatterTestCase(TestBase): def look_for_content_and_continue(self, var_name, patterns): self.expect( ("frame variable %s" % var_name), patterns=patterns) self.runCmd("continue") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py index 92368d132254..e4e65ed50d47 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -53,9 +54,3 @@ class LibcxxVBoolDataFormatterTestCase(TestBase): self.expect("expr vBool", substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py index 5cec93ed61ef..086972da7bac 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -175,9 +176,3 @@ class LibcxxVectorDataFormatterTestCase(TestBase): self.expect("frame variable strings", substrs = ['vector has 0 items']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py index 9b8307871525..08a89d893332 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -58,9 +59,3 @@ class StdIteratorDataFormatterTestCase(TestBase): self.expect('frame variable svI', substrs = ['item = "hello"']) self.expect('expr svI', substrs = ['item = "hello"']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py index f82caa85a4ba..5f8468b1f5d0 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -184,9 +185,3 @@ class StdListDataFormatterTestCase(TestBase): # check that MightHaveChildren() gets it right self.assertTrue(self.frame().FindVariable("text_list").MightHaveChildren(), "text_list.MightHaveChildren() says False for non empty!") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py index 0a2cdf1c0c08..89be9575beb8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -317,9 +318,3 @@ class StdMapDataFormatterTestCase(TestBase): self.expect('frame variable ss', substrs = ['map has 0 items', '{}']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py index 1a13571c4d6a..7f071875cb60 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -3,8 +3,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -62,9 +63,3 @@ class StdStringDataFormatterTestCase(TestBase): self.runCmd("next") self.assertTrue(var_S.GetSummary() == 'L"!!!!!"', "new S summary wrong") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py index ec34c528ad32..71434eff620d 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -53,9 +54,3 @@ class StdVBoolDataFormatterTestCase(TestBase): self.expect("expr vBool", substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py index c268317144b1..30ded55f901e 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -202,9 +203,3 @@ class StdVectorDataFormatterTestCase(TestBase): self.expect("frame variable strings", substrs = ['vector has 0 items']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py index dc125366da04..f6bdacc98f1c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -201,10 +202,3 @@ class SynthDataFormatterTestCase(TestBase): self.runCmd('type summary add -e -h -s "I am really empty" EmptyStruct') self.expect('frame variable es', substrs = ["I am really empty"]) self.expect('frame variable es', substrs = ["I am really empty {}"], matching=False) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py index 65f573322216..418083dc9397 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -91,9 +92,3 @@ class DataFormatterSynthValueTestCase(TestBase): self.assertEqual(ma.GetNumChildren(15), 15) self.assertEqual(ma.GetNumChildren(16), 16) self.assertEqual(ma.GetNumChildren(17), 16) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py index 6a949ff03739..471086b9a2fd 100644 --- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py +++ b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py @@ -2,8 +2,9 @@ Check if changing Format on an SBValue correctly propagates that new format to children as it should """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -70,9 +71,3 @@ class FormatPropagationTestCase(TestBase): Y.SetFormat(lldb.eFormatDefault) self.assertTrue(X.GetValue() == "0x00000004", "X is not hex as it asked") self.assertTrue(Y.GetValue() == "2", "Y is not defaulted") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py index 1e9008ac7dba..ad5ee5ade7c2 100644 --- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py +++ b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py @@ -2,8 +2,9 @@ Test that the user can input a format but it will not prevail over summary format's choices. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -33,9 +34,3 @@ class FrameFormatSmallStructTestCase(TestBase): 'stop reason = breakpoint']) self.expect("thread list", substrs = ['addPair(p=(x = 3, y = -3))']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py index dc486c7bf2a6..909c00f2b9f7 100644 --- a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py +++ b/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -77,10 +78,3 @@ class DataFormatterHexCapsTestCase(TestBase): self.runCmd("type summary add -s \"${var.first%X} and ${var.second%X}\" foo") self.expect('frame variable mine', substrs = ['(foo) mine = 0xAABBCCDD and 0xFF00FF00']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py index 885bec8012e8..308460382859 100644 --- a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py +++ b/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -62,10 +63,3 @@ class NSArraySyntheticTestCase(TestBase): self.assertTrue(self.frame().FindVariable("arr").MightHaveChildren(), "arr says it does not have children!") self.assertTrue(self.frame().FindVariable("other_arr").MightHaveChildren(), "arr says it does not have children!") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py index c9454fcee053..54442f2b32a8 100644 --- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py +++ b/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -64,10 +65,3 @@ class NSDictionarySyntheticTestCase(TestBase): self.assertTrue(self.frame().FindVariable("dictionary").MightHaveChildren(), "dictionary says it does not have children!") self.assertTrue(self.frame().FindVariable("mutabledict").MightHaveChildren(), "mutable says it does not have children!") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py index 1b57f0fcbcb3..41f7049882fa 100644 --- a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py +++ b/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -69,9 +70,3 @@ class NSSetSyntheticTestCase(TestBase): substrs = ['4 elements']) self.expect('frame variable mutable --ptr-depth 1 -d run -T', substrs = ['4 elements','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py index afca9bd0493d..b044fc7f172b 100644 --- a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py +++ b/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -47,10 +48,3 @@ class DataFormatterOSTypeTestCase(TestBase): # Now check that we use the right summary for OSType self.expect('frame variable', substrs = ["'test'","'best'"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py index 7bac2cfae21b..88e345c6fcee 100644 --- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py +++ b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -52,9 +53,3 @@ class PtrRef2TypedefTestCase(TestBase): # the match. self.expect("frame variable y", substrs = ['(Foo &', ') y = 0x','IntLRef']) self.expect("frame variable z", substrs = ['(Foo &&', ') z = 0x','IntRRef']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py index e9927f13b1af..0869ea9e74b4 100644 --- a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py +++ b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py @@ -2,8 +2,9 @@ Test that ValueObjectPrinter does not cause an infinite loop when a reference to a struct that contains a pointer to itself is printed. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -36,9 +37,3 @@ class DataFormatterRefPtrRecursionTestCase(TestBase): self.expect("frame variable foo --ptr-depth=1", substrs = ['ID = 1']); self.expect("frame variable foo --ptr-depth=2", substrs = ['ID = 1']); self.expect("frame variable foo --ptr-depth=3", substrs = ['ID = 1']); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py index 6dc9e1216a21..4b0ed7384ed3 100644 --- a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py +++ b/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -128,10 +129,3 @@ class Radar9974002DataFormatterTestCase(TestBase): self.expect('frame variable mine', substrs = ['mine = ', '1', '']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py index bf18d44b2cce..a4f50cbbbf91 100644 --- a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py +++ b/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py @@ -2,8 +2,9 @@ Check for an issue where capping does not work because the Target pointer appears to be changing behind our backs """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -70,9 +71,3 @@ class SyntheticCappingTestCase(TestBase): self.expect("frame variable f00_1", matching=True, substrs = ['r = 33']); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py index 969bc0ceae65..80224ccf6aae 100644 --- a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py +++ b/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -69,10 +70,3 @@ class SyntheticFilterRecomputingTestCase(TestBase): self.assertFalse(id_x.GetNumChildren() == 7, "dictionary still looks synthetic") id_x.SetPreferSyntheticValue(True) self.assertTrue(id_x.GetSummary() == "7 key/value pairs", "dictionary does not get correct summary") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py index 63beed232741..8842896684a1 100644 --- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py +++ b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py @@ -2,8 +2,9 @@ Test that the user can input a format but it will not prevail over summary format's choices. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -54,9 +55,3 @@ class UserFormatVSSummaryTestCase(TestBase): self.expect("frame variable p1", substrs = ['(Pair) p1 = x=0x00000003,y=4294967293']); self.expect("frame variable -f d p1", substrs = ['(Pair) p1 = x=3,y=-3'],matching=False); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py index d3eaa1dbb350..55c6c308f00b 100644 --- a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py +++ b/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -69,9 +70,3 @@ class VarInAggregateMisuseTestCase(TestBase): substrs = ['(TwoSummarizes) twos = TwoSummarizes @ ', 'first = SUMMARY SUCCESS 1', 'second = SUMMARY SUCCESS 3']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py index 777dc29cb3e2..4de0325ea4e4 100644 --- a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py +++ b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -51,9 +52,3 @@ class PythonSynthDataFormatterTestCase(TestBase): self.expect("frame variable x", substrs = ['T is a non-pointer type']); self.expect("frame variable y", substrs = ['T is a pointer type']); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py index 58a31cedd0a0..6235e61c712e 100644 --- a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py +++ b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py @@ -2,8 +2,9 @@ Check that vector types format properly """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -68,9 +69,3 @@ class VectorTypesFormattingTestCase(TestBase): v.SetFormat(lldb.eFormatVectorOfFloat32) oldValueAgain = v.GetChildAtIndex(0).GetValue() self.assertTrue(oldValue == oldValueAgain, "same format but different values") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/functionalities/dead-strip/TestDeadStrip.py index da74fb0ca3cb..e61476139dec 100644 --- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py +++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py @@ -2,8 +2,9 @@ Test that breakpoint works correctly in the presence of dead-code stripping. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -53,10 +54,3 @@ class DeadStripTestCase(TestBase): # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f 3", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py index fe7e3d674d7f..e9ddf122f02b 100644 --- a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py +++ b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py @@ -2,8 +2,9 @@ Test some lldb command abbreviations. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -45,10 +46,3 @@ class DisassemblyTestCase(TestBase): # make sure a few reasonable assembly instructions are here self.expect(disassembly, exe=False, startstr = "a.out`sum", substrs = instructions) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py index e67026381191..67c4d9712330 100644 --- a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py +++ b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py @@ -2,9 +2,10 @@ Test that dynamic values update their child count correctly """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -72,9 +73,3 @@ class DynamicValueChildCountTestCase(TestBase): self.assertTrue(b.GetNumChildren() != 0, "b now has 1 child") self.runCmd("continue") self.assertTrue(b.GetNumChildren() == 0, "b didn't go back to 0 children") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py index 0f66a3e7cb9c..c07628b7abe1 100644 --- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py +++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py @@ -1,7 +1,8 @@ """Test convenience variables when you drop in from lldb prompt into an embedded interpreter.""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -74,10 +75,3 @@ class ConvenienceVariablesCase(TestBase): child.expect_exact(python_prompt) self.expect(child.before, exe=False, patterns = ['frame #0: 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d' % self.line]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/exec/TestExec.py b/lldb/test/functionalities/exec/TestExec.py index c81ebefafb1b..7b6ce9776691 100644 --- a/lldb/test/functionalities/exec/TestExec.py +++ b/lldb/test/functionalities/exec/TestExec.py @@ -1,11 +1,12 @@ """ Test some lldb command abbreviations. """ +import lldb_shared + import commands import lldb import os import time -import unittest2 from lldbtest import * import lldbutil @@ -80,10 +81,3 @@ class ExecTestCase(TestBase): # Run and we should stop at breakpoint in main after exec process.Continue() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py index 76677ff2afb7..89d7f7219055 100644 --- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py +++ b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py @@ -2,9 +2,10 @@ Test that expr will time out and allow other threads to run if it blocks. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -51,9 +52,3 @@ class ExprDoesntDeadlockTestCase(TestBase): var = frame0.EvaluateExpression ("call_me_to_get_lock()") self.assertTrue (var.IsValid()) self.assertTrue (var.GetValueAsSigned (0) == 567) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/fat_archives/TestFatArchives.py b/lldb/test/functionalities/fat_archives/TestFatArchives.py index d4be28f7a56f..f6d06949b91f 100644 --- a/lldb/test/functionalities/fat_archives/TestFatArchives.py +++ b/lldb/test/functionalities/fat_archives/TestFatArchives.py @@ -1,11 +1,12 @@ """ Test some lldb command abbreviations. """ +import lldb_shared + import commands import lldb import os import time -import unittest2 from lldbtest import * import lldbutil @@ -53,10 +54,3 @@ class FatArchiveTestCase(TestBase): self.assertTrue(function.IsValid(), "Verify breakpoint in fat BSD archive has valid function debug info") self.assertTrue(line_entry.GetFileSpec(), "Verify breakpoint in fat BSD archive has source file information") self.assertTrue(line_entry.GetLine() != 0, "Verify breakpoint in fat BSD archive has source line information") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/format/TestFormats.py b/lldb/test/functionalities/format/TestFormats.py index 878f276b2342..84566ea2fc93 100644 --- a/lldb/test/functionalities/format/TestFormats.py +++ b/lldb/test/functionalities/format/TestFormats.py @@ -2,8 +2,9 @@ Test the command history mechanism """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -54,9 +55,3 @@ class TestFormats(TestBase): # child.sendline('Help__') # child.expect_exact("error: 'Help__' is not a valid command") # child.expect_exact(prompt) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py index bea265fad122..37e88c7bc457 100644 --- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -1,7 +1,8 @@ """Test that lldb functions correctly after the inferior has asserted.""" +import lldb_shared + import os, time -import unittest2 import lldb, lldbutil, lldbplatformutil from lldbtest import * @@ -237,9 +238,3 @@ class AssertingInferiorTestCase(TestBase): self.expect("thread backtrace all", substrs = [stop_reason, 'main.c:%d' % self.line]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py index cd13b803c1a7..9fce54c3c675 100644 --- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py +++ b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py @@ -1,7 +1,8 @@ """Test lldb reloads the inferior after it was changed during the session.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -77,10 +78,3 @@ class ChangedInferiorTestCase(TestBase): substrs = ['= 7']) self.expect("expression *int_ptr", substrs = ['= 7']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py index 40d76884d886..cd4ba304019f 100644 --- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -1,7 +1,8 @@ """Test that lldb functions correctly after the inferior has crashed.""" +import lldb_shared + import os, time -import unittest2 import lldb, lldbutil, lldbplatformutil from lldbtest import * @@ -214,10 +215,3 @@ class CrashingInferiorTestCase(TestBase): # The lldb expression interpreter should be able to read from addresses of the inferior after a crash. self.expect("p argv[0]", substrs = ['a.out']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index 86eba5de4d56..61eea6e4b828 100644 --- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -1,7 +1,8 @@ """Test that lldb functions correctly after the inferior has crashed while in a recursive routine.""" +import lldb_shared + import os, time -import unittest2 import lldb, lldbutil, lldbplatformutil import sys from lldbtest import * @@ -214,9 +215,3 @@ class CrashingRecursiveInferiorTestCase(TestBase): startstr = '(char *) $1 = 0x0') self.check_stop_reason() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py index 6c2a31e3711a..b0d620e74438 100644 --- a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py +++ b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py @@ -1,7 +1,8 @@ """Test stepping over and into inlined functions.""" +import lldb_shared + import os, time, sys -import unittest2 import lldb import lldbutil from lldbtest import * @@ -267,9 +268,3 @@ class TestInlineStepping(TestBase): step_sequence = [["// In max_value specialized", "into"]] self.run_step_sequence(step_sequence) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py index 8a7b4d00a2c6..5b8b11d578e7 100644 --- a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py +++ b/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py @@ -1,7 +1,9 @@ """Test for the JITLoaderGDB interface""" -import os +import lldb_shared + import unittest2 +import os import lldb from lldbtest import * import lldbutil @@ -31,9 +33,3 @@ class JITLoaderGDBTestCase(TestBase): self.assertEqual(process.GetState(), lldb.eStateExited) self.assertEqual(process.GetExitStatus(), 0) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py index e6bd49ad2d72..609a1b937a75 100644 --- a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py +++ b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py @@ -1,10 +1,11 @@ """ Test that argdumper is a viable launching strategy. """ +import lldb_shared + import lldb import os import time -import unittest2 from lldbtest import * import lldbutil @@ -92,10 +93,3 @@ class LaunchWithShellExpandTestCase(TestBase): "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint"); self.expect("frame variable argv[1]", substrs=['foo bar']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/load_unload/TestLoadUnload.py b/lldb/test/functionalities/load_unload/TestLoadUnload.py index fa1455bdba91..7122cdc3c601 100644 --- a/lldb/test/functionalities/load_unload/TestLoadUnload.py +++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py @@ -2,9 +2,10 @@ Test that breakpoint by symbol name works correctly with dynamic libs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -310,9 +311,3 @@ class LoadUnloadTestCase(TestBase): self.expect("thread list", "step over succeeded.", substrs = ['stopped', 'stop reason = step over']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/longjmp/TestLongjmp.py b/lldb/test/functionalities/longjmp/TestLongjmp.py index 3fd06f258fbc..8cb51e68db81 100644 --- a/lldb/test/functionalities/longjmp/TestLongjmp.py +++ b/lldb/test/functionalities/longjmp/TestLongjmp.py @@ -2,8 +2,9 @@ Test the use of setjmp/longjmp for non-local goto operations in a single-threaded inferior. """ +import lldb_shared + import os -import unittest2 import lldb import lldbutil from lldbtest import * @@ -80,9 +81,3 @@ class LongjmpTestCase(TestBase): self.runCmd("thread step-in", RUN_SUCCEEDED) self.runCmd("thread step-out", RUN_SUCCEEDED) self.check_status() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/memory/read/TestMemoryRead.py b/lldb/test/functionalities/memory/read/TestMemoryRead.py index 67cf389d20d5..c6430aae91d6 100644 --- a/lldb/test/functionalities/memory/read/TestMemoryRead.py +++ b/lldb/test/functionalities/memory/read/TestMemoryRead.py @@ -2,9 +2,10 @@ Test the 'memory read' command. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -86,10 +87,3 @@ class MemoryReadTestCase(TestBase): # 0x7fff5fbff598: error: unsupported byte size (20) for float format self.expect("memory read --format 'float' --count 1 --size 20 `&my_double`", substrs = ['unsupported byte size (20) for float format']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py index 786102eae81a..7835a3733be7 100644 --- a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py +++ b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py @@ -1,7 +1,8 @@ """Test evaluating expressions which ref. index variable 'i' which just goes from out of scope to in scope when stopped at the breakpoint.""" -import unittest2 +import lldb_shared + import lldb from lldbtest import * import lldbutil @@ -38,9 +39,3 @@ class NonOverlappingIndexVariableCase(TestBase): self.runCmd('expr ptr[0]->point.y') self.runCmd('expr ptr[i]->point.x') self.runCmd('expr ptr[i]->point.y') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py index cda0cd6606ec..bf29645062cd 100644 --- a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py +++ b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py @@ -1,8 +1,9 @@ """ Test that using a non-existent architecture name does not crash LLDB. """ +import lldb_shared + import lldb -import unittest2 from lldbtest import * import lldbutil @@ -24,10 +25,3 @@ class NoSuchArchTestCase(TestBase): # Now just create the target with the default arch and check it's fine target = self.dbg.CreateTarget(exe) self.assertTrue(target.IsValid(), "This target should now be valid") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py index 47e7db4b3668..54c1d21c766f 100644 --- a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py +++ b/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py @@ -4,8 +4,9 @@ This exercises classes like ObjectFileELF and their support for opening foreign-architecture object files. """ +import lldb_shared + import os.path -import unittest2 import lldb from lldbtest import * import lldbutil @@ -36,9 +37,3 @@ class TestImageListMultiArchitecture(TestBase): self.match("image list -t -A", [expected_triple_and_arch_regex]) # Revert to the host platform after all of this is done self.runCmd("platform select host") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/paths/TestPaths.py b/lldb/test/functionalities/paths/TestPaths.py index c9245b03e6bb..357692065658 100644 --- a/lldb/test/functionalities/paths/TestPaths.py +++ b/lldb/test/functionalities/paths/TestPaths.py @@ -1,10 +1,11 @@ """ Test some lldb command abbreviations. """ +import lldb_shared + import lldb import os import time -import unittest2 from lldbtest import * import lldbutil @@ -43,10 +44,3 @@ class TestPaths(TestBase): fspec = lldb.SBFileSpec("C:\\dummy1\\dummy2//unknown_file", True); self.assertEqual(os.path.normpath(fspec.GetDirectory()), os.path.normpath("C:/dummy1/dummy2")); self.assertEqual(fspec.GetFilename(), "unknown_file"); - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/platform/TestPlatformCommand.py b/lldb/test/functionalities/platform/TestPlatformCommand.py index c7afacf54782..97908269da85 100644 --- a/lldb/test/functionalities/platform/TestPlatformCommand.py +++ b/lldb/test/functionalities/platform/TestPlatformCommand.py @@ -2,8 +2,9 @@ Test some lldb platform commands. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -60,10 +61,3 @@ class PlatformCommandTestCase(TestBase): self.skipTest("due to taking too long to complete.") self.expect("platform shell sleep 15", error=True, substrs = ["error: timed out waiting for shell command to complete"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py index f00ada5040a5..4053fe336c16 100644 --- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py +++ b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py @@ -2,9 +2,10 @@ Test that plugins that load commands work correctly. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -59,10 +60,3 @@ class PluginCommandTestCase(TestBase): print retobj.GetOutput() self.expect(retobj,substrs = ['abc def ghi'], exe=False) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py index d4b1b5f47c89..749916fefd72 100644 --- a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py +++ b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py @@ -2,9 +2,10 @@ Test that the Python operating system plugin works correctly """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -145,10 +146,3 @@ class PluginPythonOSPlugin(TestBase): self.assertTrue(line_entry.GetFileSpec().GetFilename() == 'main.c', "Make sure we stepped from line 5 to line 6 in main.c") self.assertTrue(line_entry.GetLine() == 6, "Make sure we stepped from line 5 to line 6 in main.c") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py index 84bf777767f2..bbacc19846cb 100644 --- a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py +++ b/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py @@ -2,7 +2,8 @@ Test basics of mini dump debugging. """ -import unittest2 +import lldb_shared + import lldb from lldbtest import * import lldbutil @@ -36,9 +37,3 @@ class MiniDumpTestCase(TestBase): self.dbg.CreateTarget("") self.target = self.dbg.GetSelectedTarget() self.process = self.target.LoadCore("fizzbuzz_no_heap.dmp") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/test/functionalities/process_attach/TestProcessAttach.py index b8005c2c02aa..ed11a486181b 100644 --- a/lldb/test/functionalities/process_attach/TestProcessAttach.py +++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py @@ -2,8 +2,9 @@ Test process attach. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -52,9 +53,3 @@ class ProcessAttachTestCase(TestBase): # Call super's tearDown(). TestBase.tearDown(self) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py b/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py index 33eb35ff3136..74013faacfb0 100644 --- a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py +++ b/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py @@ -2,9 +2,10 @@ Test denied process attach. """ +import lldb_shared + import os import time -import unittest2 import lldb from lldbtest import * @@ -54,10 +55,3 @@ class AttachDeniedTestCase(TestBase): self.expect('process attach -p ' + pid, startstr = 'error: attach failed:', error = True) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py b/lldb/test/functionalities/process_group/TestChangeProcessGroup.py index 343e53d134f2..6864c4759537 100644 --- a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py +++ b/lldb/test/functionalities/process_group/TestChangeProcessGroup.py @@ -1,7 +1,8 @@ """Test that we handle inferiors which change their process group""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -97,9 +98,3 @@ class ChangeProcessGroupTestCase(TestBase): shell_command = lldb.SBPlatformShellCommand(cmd) err = platform.Run(shell_command) return (err, shell_command.GetStatus(), shell_command.GetOutput()) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py index e843bfc18120..50e219f4dcbd 100644 --- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py +++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py @@ -2,8 +2,9 @@ Test lldb process launch flags. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -175,11 +176,3 @@ class ProcessLaunchTestCase(TestBase): if not success: self.fail(err_msg) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py index 243b8621a40b..fa9000410e0b 100644 --- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py +++ b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py @@ -2,8 +2,9 @@ Test lldb data formatter subsystem. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -54,9 +55,3 @@ class ValueObjectRecursionTestCase(TestBase): self.assertTrue(child.GetChildAtIndex(0).IsValid(),"the deep ValueObject has no value") self.assertTrue(child.GetChildAtIndex(0).GetValueAsUnsigned() != 0,"the deep ValueObject has a zero value") self.assertTrue(child.GetChildAtIndex(1).GetValueAsUnsigned() != 0, "the deep ValueObject has no next") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/test/functionalities/register/TestRegisters.py index 32750de38068..efdbaaf8e478 100755 --- a/lldb/test/functionalities/register/TestRegisters.py +++ b/lldb/test/functionalities/register/TestRegisters.py @@ -2,9 +2,10 @@ Test the 'register' command. """ +import lldb_shared + import os, sys, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -352,9 +353,3 @@ class RegisterCommandsTestCase(TestBase): if test_16bit_regs: self.expect("expr -- $ax == (($ah << 8) | $al)", substrs = ['true']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/rerun/TestRerun.py b/lldb/test/functionalities/rerun/TestRerun.py index 1a0430fad683..7d5972bb9b5f 100644 --- a/lldb/test/functionalities/rerun/TestRerun.py +++ b/lldb/test/functionalities/rerun/TestRerun.py @@ -1,10 +1,11 @@ """ Test that argdumper is a viable launching strategy. """ +import lldb_shared + import lldb import os import time -import unittest2 from lldbtest import * import lldbutil @@ -71,11 +72,3 @@ class TestRerun(TestBase): self.expect("frame variable argv[1]", substrs=['1']) self.expect("frame variable argv[2]", substrs=['2']) self.expect("frame variable argv[3]", substrs=['3']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/return-value/TestReturnValue.py b/lldb/test/functionalities/return-value/TestReturnValue.py index bafde43e7e25..9f7c07a3653d 100644 --- a/lldb/test/functionalities/return-value/TestReturnValue.py +++ b/lldb/test/functionalities/return-value/TestReturnValue.py @@ -2,9 +2,10 @@ Test getting return-values correctly when stepping out """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -206,9 +207,3 @@ class ReturnValueTestCase(TestBase): ret_child_str = ret_child.GetValue() self.assertEqual(in_child_str, ret_child_str) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/set-data/TestSetData.py b/lldb/test/functionalities/set-data/TestSetData.py index 3bd5ee4ce96d..f260bbdd9ef5 100644 --- a/lldb/test/functionalities/set-data/TestSetData.py +++ b/lldb/test/functionalities/set-data/TestSetData.py @@ -2,8 +2,9 @@ Set the contents of variables and registers using raw data """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -57,9 +58,3 @@ class SetDataTestCase(TestBase): self.expect("fr var -d run-target string", VARIABLES_DISPLAYED_CORRECTLY, substrs = ['NSString *', 'nil']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py index 5ce843d52862..71b96b76c116 100644 --- a/lldb/test/functionalities/signal/TestSendSignal.py +++ b/lldb/test/functionalities/signal/TestSendSignal.py @@ -1,7 +1,8 @@ """Test that lldb command 'process signal SIGUSR1' to send a signal to the inferior works.""" +import lldb_shared + import os, time, signal -import unittest2 import lldb from lldbtest import * import lldbutil @@ -100,9 +101,3 @@ class SendSignalTestCase(TestBase): self.assertTrue(state == expected_state, "It was the %s state." % lldb.SBDebugger_StateAsCString(expected_state)) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py index fdb8f995e754..70b8cf2498ea 100644 --- a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py +++ b/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py @@ -1,7 +1,8 @@ """Test that we can debug inferiors that handle SIGSEGV by themselves""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -38,9 +39,3 @@ class HandleSegvTestCase(TestBase): process.Continue() self.assertEqual(process.GetState(), lldb.eStateExited) self.assertEqual(process.GetExitStatus(), 0) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/signal/raise/TestRaise.py b/lldb/test/functionalities/signal/raise/TestRaise.py index 0099251cb984..6705bfd5ff38 100644 --- a/lldb/test/functionalities/signal/raise/TestRaise.py +++ b/lldb/test/functionalities/signal/raise/TestRaise.py @@ -1,7 +1,8 @@ """Test that we handle inferiors that send signals to themselves""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -216,9 +217,3 @@ class RaiseTestCase(TestBase): # We are done process.Kill() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py index cd45412679a8..17af6cb8c5ea 100644 --- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py +++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py @@ -2,8 +2,9 @@ Test the lldb command line takes a filename with single quote chars. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -66,10 +67,3 @@ class SingleQuoteInCommandLineTestCase(TestBase): self.expect(from_child, exe=False, substrs = ["Current executable set to"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py index 1b38afc3aaa5..3585b2f531a8 100644 --- a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py +++ b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py @@ -2,9 +2,10 @@ Test thread step-in, step-over and step-out work with the "Avoid no debug" option. """ +import lldb_shared + import os import re -import unittest2 import lldb, lldbutil import sys from lldbtest import * @@ -107,10 +108,3 @@ class ReturnValueTestCase(TestBase): # frame. In gdb, step-over/step-in move to the end of the line they stepped out to. # If we ever change this we will need to fix this test. self.hit_correct_line ("int return_value = no_debug_caller(5, called_from_nodebug)") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py index df94835e380b..9158412fc5a2 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py @@ -5,7 +5,6 @@ Test lldb target stop-hook command. import lldb_shared import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -62,10 +61,3 @@ class StopHookCmdTestCase(TestBase): self.expect('target stop-hook list', 'Stop Hook deleted successfully', substrs = ['No stop hooks.']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py index abb99953bc90..211c3f97cb22 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py @@ -2,8 +2,9 @@ Test lldb target stop-hook mechanism to see whether it fires off correctly . """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -95,10 +96,3 @@ class StopHookMechanismTestCase(TestBase): # Verify that the 'Stop Hooks' mechanism is NOT BEING fired off. self.expect(child.before, exe=False, matching=False, substrs = ['(void *) $']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py index 59c5222f5e19..49da3fae154c 100644 --- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py +++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py @@ -2,8 +2,9 @@ Test that lldb stop-hook works for multiple threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -71,10 +72,3 @@ class StopHookForMultipleThreadsTestCase(TestBase): # Continue and expect to find the output emitted by the firing of our stop hook. child.sendline('continue') child.expect_exact('(uint32_t) ::g_val = ') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/target_command/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py index 8e81deaa81eb..28dcd1c8a457 100644 --- a/lldb/test/functionalities/target_command/TestTargetCommand.py +++ b/lldb/test/functionalities/target_command/TestTargetCommand.py @@ -2,7 +2,8 @@ Test some target commands: create, list, select, variable. """ -import unittest2 +import lldb_shared + import lldb import sys from lldbtest import * @@ -196,9 +197,3 @@ class targetCommandTestCase(TestBase): substrs = ['a']) self.expect("target variable my_global_char", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["my_global_char", "'X'"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py index 65ca699332ff..8a2ad59e2585 100644 --- a/lldb/test/functionalities/thread/TestNumThreads.py +++ b/lldb/test/functionalities/thread/TestNumThreads.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -48,9 +49,3 @@ class NumberOfThreadsTestCase(TestBase): # Using std::thread may involve extra threads, so we assert that there are # at least 4 rather than exactly 4. self.assertTrue(num_threads >= 4, 'Number of expected threads and actual threads do not match.') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py index e149f361ea0f..462314b735d0 100644 --- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -72,9 +73,3 @@ class BreakpointAfterJoinTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py index 149d6a22bc80..3fa1b4968bcc 100644 --- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py +++ b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py @@ -10,8 +10,10 @@ until exit or a crash takes place, and the number of events seen by LLDB is verified to match the expected number of events. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -484,10 +486,3 @@ class ConcurrentEventsTestCase(TestBase): watchpoint_hit_count = self.thread_watchpoint.GetHitCount() if expected_watchpoint_threads > 0 else 0 self.assertEqual(expected_watchpoint_threads, watchpoint_hit_count, "Expected %d watchpoint hits, got %d" % (expected_watchpoint_threads, watchpoint_hit_count)) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py index e196fa29429f..89eccfdccf7a 100644 --- a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py +++ b/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py @@ -2,8 +2,9 @@ Test that step-inst over a crash behaves correctly. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -47,10 +48,3 @@ class CreateDuringStepTestCase(TestBase): self.assertEqual(process.GetState(), lldb.eStateStopped, PROCESS_STOPPED) self.assertTrue(lldbutil.is_thread_crashed(self, thread), "Thread has crashed") process.Kill() - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py index 51bc26f9d0e2..d91f8d5d4eb7 100644 --- a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py +++ b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py @@ -2,8 +2,9 @@ Test thread creation after process attach. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -115,10 +116,3 @@ class CreateAfterAttachTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py index 76fbc1559ba0..a5ceae3dacdb 100644 --- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -122,9 +123,3 @@ class CreateDuringStepTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py index cecc5d91f784..dc1d4dca9b02 100644 --- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -76,9 +77,3 @@ class ExitDuringBreakpointTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index a69bb7f2a76c..30ca8fe90255 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -138,9 +139,3 @@ class ExitDuringStepTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/jump/TestThreadJump.py b/lldb/test/functionalities/thread/jump/TestThreadJump.py index 3919a242127a..a9b06863a72b 100644 --- a/lldb/test/functionalities/thread/jump/TestThreadJump.py +++ b/lldb/test/functionalities/thread/jump/TestThreadJump.py @@ -2,8 +2,9 @@ Test jumping to different places. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -55,9 +56,3 @@ class ThreadJumpTestCase(TestBase): self.runCmd("thread step-out") # return out self.runCmd("thread step-over") # assign to the global self.expect("expr %s" % var, substrs = [value]) # check it - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py index cf6cda62a300..3afd6a224750 100644 --- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -72,9 +73,3 @@ class MultipleBreakpointTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py index e1f29a40b05e..06225f1eefc8 100644 --- a/lldb/test/functionalities/thread/state/TestThreadStates.py +++ b/lldb/test/functionalities/thread/state/TestThreadStates.py @@ -2,8 +2,10 @@ Test thread states. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -340,9 +342,3 @@ class ThreadStateTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py index 96a62e3ddca1..3100b361d169 100644 --- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py +++ b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py @@ -2,8 +2,9 @@ Test stepping out from a function in a multi-threaded program. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -126,9 +127,3 @@ class ThreadStepOutTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(self.inferior_process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py index 99f7ac63b20b..39797651e793 100644 --- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py +++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py @@ -2,8 +2,9 @@ Test number of threads. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -112,9 +113,3 @@ class ThreadExitTestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py index 1c22ae858a03..0c2c884cf6ce 100644 --- a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py +++ b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py @@ -2,9 +2,10 @@ Test that we obey thread conditioned breakpoints. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -59,10 +60,3 @@ class ThreadSpecificBreakTestCase(TestBase): next_stop_state = process.GetState() self.assertTrue (next_stop_state == lldb.eStateExited, "We should have not hit the breakpoint again.") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/tty/TestTerminal.py b/lldb/test/functionalities/tty/TestTerminal.py index e346e1cd0cd9..79cc264ab15d 100644 --- a/lldb/test/functionalities/tty/TestTerminal.py +++ b/lldb/test/functionalities/tty/TestTerminal.py @@ -2,8 +2,10 @@ Test lldb command aliases. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -33,10 +35,3 @@ class LaunchInTerminalTestCase(TestBase): self.assertTrue(error.Success(), "Make sure launch happened successfully in a terminal window") # Running in synchronous mode our process should have run and already exited by the time target.Launch() returns self.assertTrue(process.GetState() == lldb.eStateExited) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/test/functionalities/type_completion/TestTypeCompletion.py index 0e11ff67e3a9..57952182a266 100644 --- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py +++ b/lldb/test/functionalities/type_completion/TestTypeCompletion.py @@ -2,8 +2,9 @@ Check that types only get completed when necessary. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -111,9 +112,3 @@ class TypeCompletionTestCase(TestBase): string = field0.GetType().GetPointeeType() self.assertTrue(string.IsValid(), 'std::string should be valid') self.assertTrue(string.IsTypeComplete(), 'std::string should now be complete') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/type_lookup/TestTypeLookup.py b/lldb/test/functionalities/type_lookup/TestTypeLookup.py index 2a75656b9ab1..4e27a02d4e51 100644 --- a/lldb/test/functionalities/type_lookup/TestTypeLookup.py +++ b/lldb/test/functionalities/type_lookup/TestTypeLookup.py @@ -2,8 +2,9 @@ Test type lookup command. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import datetime @@ -38,9 +39,3 @@ class TypeLookupTestCase(TestBase): self.expect('type lookup NSURL', substrs=['NSURL']) self.expect('type lookup NSArray', substrs=['NSArray']) self.expect('type lookup NSObject', substrs=['NSObject', 'isa']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py index 16b44857ac1c..2d557f1b9d0f 100644 --- a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py +++ b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py @@ -2,8 +2,9 @@ Test that we can backtrace correctly with 'noreturn' functions on the stack """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -71,10 +72,3 @@ class NoreturnUnwind(TestBase): if thread.GetFrameAtIndex (main_frame_number).GetFunctionName() != "main": self.fail("Did not find main() above func_a().") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py index 9aec735baca9..fe375b422ecd 100644 --- a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py +++ b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py @@ -2,8 +2,9 @@ Test that we can backtrace correctly with 'sigtramp' functions on the stack """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -76,9 +77,3 @@ class SigtrampUnwind(TestBase): if found_main == False: self.fail("Unable to find main() in backtrace.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py b/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py index cf147380b0d9..58f7db04be16 100644 --- a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py +++ b/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py @@ -10,8 +10,10 @@ file up and generate a test case from it in run time (with name test_standard_un after escaping some special characters). """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -139,9 +141,3 @@ for f in test_source_files: test_function_dwarf.__name__ = test_name setattr(StandardUnwindTest, test_function_dwarf.__name__, test_function_dwarf) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py index 2f7358710086..9a51c5875a62 100644 --- a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py +++ b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py @@ -2,8 +2,9 @@ Verify that the hash computing logic for ValueObject's values can't crash us. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -47,9 +48,3 @@ class ValueMD5CrashTestCase(TestBase): v = value.GetValue() # if we are here, instead of crashed, the test succeeded - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py index 624dc567aabf..d784faa24c72 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py +++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py @@ -2,9 +2,10 @@ Test lldb watchpoint that uses '-s size' to watch a pointed location with size. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -92,10 +93,3 @@ class HelloWatchLocationTestCase(TestBase): substrs = ['hit_count = 1']) self.runCmd("thread backtrace all") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py index 267f61c09eb5..ee92815f77ad 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py +++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py @@ -2,8 +2,9 @@ Test my first lldb watchpoint. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -79,10 +80,3 @@ class HelloWatchpointTestCase(TestBase): # The hit count should now be 1. self.expect("watchpoint list -v", substrs = ['hit_count = 1']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py index e1bd0ddc0749..024791ae76da 100644 --- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py +++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py @@ -2,8 +2,9 @@ Test that lldb watchpoint works for multiple threads. """ +import lldb_shared + import os, time -import unittest2 import re import lldb from lldbtest import * @@ -132,10 +133,3 @@ class WatchpointForMultipleThreadsTestCase(TestBase): continue else: self.fail("The stop reason should be either break or watchpoint") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py index d13c89ce667f..3401976d797b 100644 --- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py +++ b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py @@ -1,6 +1,7 @@ """Test stepping over watchpoints.""" -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -103,9 +104,3 @@ class TestStepOverWatchpoint(TestBase): self.assertTrue(stop_reason == lldb.eStopReasonPlanComplete, STOPPED_DUE_TO_STEP_IN) self.assertTrue(watchpoint_hit, "Watchpoint never hit.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py index 2c4b3e1142ef..b2161369ded3 100644 --- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py +++ b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py @@ -2,8 +2,10 @@ Test that a variable watchpoint should only hit when in scope. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -77,10 +79,3 @@ class WatchedVariableHitWhenInScopeTestCase(TestBase): # The hit count should now be 1. self.expect("watchpoint list -v", substrs = ['hit_count = 1']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py index cc0523085e2d..cfa6a10bc253 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py @@ -2,8 +2,9 @@ Test watchpoint list, enable, disable, and delete commands. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -308,10 +309,3 @@ class WatchpointCommandsTestCase(TestBase): # The hit count should be 1. self.expect("watchpoint list -v", substrs = ['hit_count = 1']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py index 2d269fd4d36a..a7b9d4c0ea89 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py @@ -2,8 +2,9 @@ Test 'watchpoint command'. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -134,10 +135,3 @@ class WatchpointLLDBCommandTestCase(TestBase): # be 'exited'. self.expect("process status", substrs = ['exited']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py index 79566fbd9e9e..6bd8b93343ea 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py @@ -2,8 +2,9 @@ Test 'watchpoint command'. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -82,10 +83,3 @@ class WatchpointPythonCommandTestCase(TestBase): # The watchpoint command "forced" our global variable 'cookie' to become 777. self.expect("frame variable --show-globals cookie", substrs = ['(int32_t)', 'cookie = 777']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py index 726b80f1ed45..5b66e653bcba 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py @@ -2,8 +2,9 @@ Test watchpoint modify command to set condition on a watchpoint. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -73,10 +74,3 @@ class WatchpointConditionCmdTestCase(TestBase): # The hit count should now be 2. self.expect("watchpoint list -v", substrs = ['hit_count = 5']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py index 307be3a50f15..821062d939a2 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py @@ -1,7 +1,8 @@ """Test that adding, deleting and modifying watchpoints sends the appropriate events.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -84,9 +85,3 @@ class TestWatchpointEvents (TestBase): print "Found an event I didn't expect: ", event self.assertTrue (not found_event, "Only one event per change.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py index 96ed6433df7d..2a340dad2556 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py @@ -2,8 +2,9 @@ Test displayed value of a vector variable while doing watchpoint operations """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -42,9 +43,3 @@ class TestValueOfVectorVariableTestCase(TestBase): # Value of a vector variable should be displayed correctly self.expect("watchpoint set variable global_vector", WATCHPOINT_CREATED, substrs = ['new value: (1, 2, 3, 4)']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py index eaa05e833905..cdfd435b2adf 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py @@ -2,8 +2,9 @@ Test lldb watchpoint that uses 'watchpoint set -w write -s size' to watch a pointed location with size. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -82,10 +83,3 @@ class WatchLocationUsingWatchpointSetTestCase(TestBase): substrs = ['hit_count = 1']) self.runCmd("thread backtrace all") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py index 9683c88fce90..f7e7bcff702e 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py @@ -2,8 +2,9 @@ Test error cases for the 'watchpoint set' command to make sure it errors out when necessary. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -62,10 +63,3 @@ class WatchpointSetErrorTestCase(TestBase): # Wrong size parameter is an error. self.expect("watchpoint set variable -s -128", error=True, substrs = ['invalid enumeration value']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py index b30c143aa7d7..2c665e104fe8 100644 --- a/lldb/test/help/TestHelp.py +++ b/lldb/test/help/TestHelp.py @@ -4,8 +4,9 @@ Test some lldb help commands. See also CommandInterpreter::OutputFormattedHelpText(). """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -160,10 +161,3 @@ class HelpCommandTestCase(TestBase): substrs = ['The following subcommands are supported:'], patterns = ['expression +--', 'variable +--']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/lang/c/anonymous/TestAnonymous.py index da0ef5b9f11c..1899384c1cde 100644 --- a/lldb/test/lang/c/anonymous/TestAnonymous.py +++ b/lldb/test/lang/c/anonymous/TestAnonymous.py @@ -1,7 +1,8 @@ """Test that anonymous structs/unions are transparent to member access""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -142,9 +143,3 @@ class AnonymousTestCase(TestBase): # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py index e159efc43829..98e839ca1046 100644 --- a/lldb/test/lang/c/array_types/TestArrayTypes.py +++ b/lldb/test/lang/c/array_types/TestArrayTypes.py @@ -1,7 +1,8 @@ """Test breakpoint by file/line number; and list variables with array types.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -193,10 +194,3 @@ class ArrayTypesTestCase(TestBase): self.assertTrue(argc.GetValueType() == lldb.eValueTypeVariableArgument, "Variable 'argc' should have '%s' value type." % value_type_to_str(lldb.eValueTypeVariableArgument)) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py index 090b31950e8a..024af2d1c5c3 100644 --- a/lldb/test/lang/c/bitfields/TestBitfields.py +++ b/lldb/test/lang/c/bitfields/TestBitfields.py @@ -1,7 +1,8 @@ """Show bitfields and check that they display correctly.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -157,10 +158,3 @@ class BitfieldsTestCase(TestBase): # Now kill the process, and we are done. rc = target.GetProcess().Kill() self.assertTrue(rc.Success()) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/test/lang/c/blocks/TestBlocks.py index 6dd4bec46e45..783401e2e0f6 100644 --- a/lldb/test/lang/c/blocks/TestBlocks.py +++ b/lldb/test/lang/c/blocks/TestBlocks.py @@ -1,7 +1,9 @@ """Test that lldb can invoke blocks and access variables inside them""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -55,9 +57,3 @@ class BlocksTestCase(TestBase): self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, substrs = ['stopped', 'stop reason = breakpoint']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/lang/c/const_variables/TestConstVariables.py index 8954e49a1894..30fc91adab4d 100644 --- a/lldb/test/lang/c/const_variables/TestConstVariables.py +++ b/lldb/test/lang/c/const_variables/TestConstVariables.py @@ -1,7 +1,8 @@ """Check that compiler-generated constant values work correctly""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -57,9 +58,3 @@ class ConstVariableTestCase(TestBase): substrs = ['(int) $1 = 256']) self.runCmd("kill") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/enum_types/TestEnumTypes.py b/lldb/test/lang/c/enum_types/TestEnumTypes.py index 96d290739a88..6f1c52d28441 100644 --- a/lldb/test/lang/c/enum_types/TestEnumTypes.py +++ b/lldb/test/lang/c/enum_types/TestEnumTypes.py @@ -1,7 +1,8 @@ """Look up enum type information and check for correct display.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -66,9 +67,3 @@ class EnumTypesTestCase(TestBase): self.expect("frame variable day", 'check for valid enumeration value', substrs = [enum_value]) lldbutil.continue_to_breakpoint (self.process(), bkpt) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py index 9eb8ae6d2451..6db0b30b567a 100644 --- a/lldb/test/lang/c/forward/TestForwardDeclaration.py +++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py @@ -1,7 +1,8 @@ """Test that forward declaration of a data structure gets resolved correctly.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -42,10 +43,3 @@ class ForwardDeclarationTestCase(TestBase): substrs = ['(bar)', '(int) a = 1', '(int) b = 2']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py index f8ac8a68207f..fb46ea8be5e2 100644 --- a/lldb/test/lang/c/function_types/TestFunctionTypes.py +++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py @@ -1,7 +1,8 @@ """Test variable with function ptr type and that break on the function works.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -71,9 +72,3 @@ class FunctionTypesTestCase(TestBase): # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/lang/c/global_variables/TestGlobalVariables.py index 23005095f432..7d9c0ddaecdf 100644 --- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py +++ b/lldb/test/lang/c/global_variables/TestGlobalVariables.py @@ -1,7 +1,8 @@ """Show global variables and check that they do indeed have global scopes.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -72,10 +73,3 @@ class GlobalVariablesTestCase(TestBase): substrs = ['g_marked_spot.y', '21']) self.expect("target variable g_marked_spot.y", VARIABLES_DISPLAYED_CORRECTLY, matching=False, substrs = ["can't be resolved"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/modules/TestCModules.py b/lldb/test/lang/c/modules/TestCModules.py index 1ac8484a5f5e..5875c7773294 100644 --- a/lldb/test/lang/c/modules/TestCModules.py +++ b/lldb/test/lang/c/modules/TestCModules.py @@ -1,7 +1,8 @@ """Test that importing modules in C works as expected.""" +import lldb_shared + import os, time -import unittest2 import lldb import platform import lldbutil @@ -60,9 +61,3 @@ class CModulesTestCase(TestBase): TestBase.setUp(self) # Find the line number to break inside main(). self.line = line_number('main.c', '// Set breakpoint 0 here.') - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/lang/c/register_variables/TestRegisterVariables.py index 9274524c87ab..a73bc26e7eb3 100644 --- a/lldb/test/lang/c/register_variables/TestRegisterVariables.py +++ b/lldb/test/lang/c/register_variables/TestRegisterVariables.py @@ -1,7 +1,8 @@ """Check that compiler-generated register values work correctly""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -65,9 +66,3 @@ class RegisterVariableTestCase(TestBase): substrs = ['(int) $3 = 5']) self.runCmd("kill") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py index 4e64a4100ca5..ae70f77868eb 100644 --- a/lldb/test/lang/c/set_values/TestSetValues.py +++ b/lldb/test/lang/c/set_values/TestSetValues.py @@ -1,7 +1,8 @@ """Test settings and readings of program variables.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -106,10 +107,3 @@ class SetValuesTestCase(TestBase): self.runCmd("expression i = 1.5") self.expect("frame variable --show-types", VARIABLES_DISPLAYED_CORRECTLY, startstr = "(long double) i = 1.5") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/shared_lib/TestSharedLib.py b/lldb/test/lang/c/shared_lib/TestSharedLib.py index f2a84af0161d..dd095272d80f 100644 --- a/lldb/test/lang/c/shared_lib/TestSharedLib.py +++ b/lldb/test/lang/c/shared_lib/TestSharedLib.py @@ -1,5 +1,7 @@ """Test that types defined in shared libraries work correctly.""" +import lldb_shared + import unittest2 import lldb from lldbtest import * @@ -65,9 +67,3 @@ class SharedLibTestCase(TestBase): # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py index c6cd427788c6..611a3618a985 100644 --- a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py +++ b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py @@ -1,5 +1,7 @@ """Test that types defined in shared libraries with stripped symbols work correctly.""" +import lldb_shared + import unittest2 import lldb from lldbtest import * @@ -67,9 +69,3 @@ class SharedLibStrippedTestCase(TestBase): # The breakpoint should have a hit count of 1. self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE, substrs = [' resolved, hit count = 1']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py index 11d639a89027..ed50926fa479 100644 --- a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py +++ b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py @@ -1,7 +1,8 @@ """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -237,9 +238,3 @@ class TestCStepping(TestBase): thread.StepInto("NoSuchFunction") self.assertTrue (thread.GetFrameAtIndex(0).GetFunctionName() == "main") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/stepping/TestThreadStepping.py b/lldb/test/lang/c/stepping/TestThreadStepping.py index 50322b8287c8..e02551b3ac6e 100644 --- a/lldb/test/lang/c/stepping/TestThreadStepping.py +++ b/lldb/test/lang/c/stepping/TestThreadStepping.py @@ -2,9 +2,10 @@ Test thread stepping features in combination with frame select. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * import lldbutil @@ -75,10 +76,3 @@ class ThreadSteppingTestCase(TestBase): self.expect("thread backtrace", STEP_OUT_SUCCEEDED, substrs = ["stop reason = step out"], patterns = ["frame #0.*main.c:%d" % self.line4]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/strings/TestCStrings.py b/lldb/test/lang/c/strings/TestCStrings.py index a2752df79763..f1d9be2149f8 100644 --- a/lldb/test/lang/c/strings/TestCStrings.py +++ b/lldb/test/lang/c/strings/TestCStrings.py @@ -52,9 +52,3 @@ class CStringsTestCase(TestBase): self.expect("expression !z", substrs = ['false']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py index 564f069f1b9d..305ff3984de6 100644 --- a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py +++ b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py @@ -1,7 +1,9 @@ """Test that thread-local storage can be read correctly.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -69,9 +71,3 @@ class TlsGlobalTestCase(TestBase): patterns = ["\(int\) \$.* = 44"]) self.expect("expr var_shared", VARIABLES_DISPLAYED_CORRECTLY, patterns = ["\(int\) \$.* = 33"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/c/typedef/Testtypedef.py b/lldb/test/lang/c/typedef/Testtypedef.py index c00bcd4e3c5f..5c2882b715d1 100644 --- a/lldb/test/lang/c/typedef/Testtypedef.py +++ b/lldb/test/lang/c/typedef/Testtypedef.py @@ -1,7 +1,8 @@ """Look up type information for typedefs of same name at different lexical scope and check for correct display.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -43,9 +44,3 @@ class TypedefTestCase(TestBase): self.expect("image lookup -t a", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ['name = "' + t + '"']) self.runCmd("continue") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/bool/TestCPPBool.py b/lldb/test/lang/cpp/bool/TestCPPBool.py index 913821733c13..0724fc562513 100644 --- a/lldb/test/lang/cpp/bool/TestCPPBool.py +++ b/lldb/test/lang/cpp/bool/TestCPPBool.py @@ -24,9 +24,3 @@ class CPPBoolTestCase(TestBase): self.expect("expression -- my_bool = true", startstr = "(bool) $1 = true") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py index a8b69ded6d40..867bfed4d7fb 100644 --- a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py +++ b/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py @@ -2,8 +2,9 @@ Test lldb breakpoint command for CPP methods & functions in a namespace. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -79,11 +80,3 @@ class CPPBreakpointCommandsTestCase(TestBase): a_out_module, nested_comp_unit) self.assertTrue (plain_method_break.GetNumLocations() == 1) - - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py index 6adbcd6f7900..bba23992c3c8 100644 --- a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py +++ b/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py @@ -31,9 +31,3 @@ class CallCPPFunctionTestCase(TestBase): self.expect("expression -- a_function_to_call()", startstr = "(int) $0 = 0") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py index a6cf56cd6f61..fa9338ab51bb 100644 --- a/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py +++ b/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py @@ -71,9 +71,3 @@ class TestCppChainedCalls(TestBase): test_result = frame.EvaluateExpression("get(t) && get(t)") self.assertTrue(test_result.IsValid() and test_result.GetValue() == "true", "get(t) && get(t) = true") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py index f604c34516d6..7392f79bce79 100644 --- a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py +++ b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py @@ -3,8 +3,9 @@ Test that the C++11 support for char16_t and char32_t works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -85,9 +86,3 @@ class Char1632TestCase(TestBase): # Check that we can run expressions that return charN_t self.expect("expression u'a'",substrs = ['(char16_t) $',"61 u'a'"]) self.expect("expression U'a'",substrs = ['(char32_t) $',"61 U'a'"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py index 88aeb72a7991..c9182fe69d7b 100644 --- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py +++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py @@ -2,8 +2,9 @@ Test display and Python APIs on file and class static variables. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -115,10 +116,3 @@ class StaticVariableTestCase(TestBase): val = frame.FindValue("hello_world", lldb.eValueTypeVariableLocal) self.DebugSBValue(val) self.assertTrue(val.GetName() == 'hello_world') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py index 2e9353b5b65f..6d737e04c992 100644 --- a/lldb/test/lang/cpp/class_types/TestClassTypes.py +++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py @@ -1,7 +1,8 @@ """Test breakpoint on a class constructor; and variable list the this object.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -210,9 +211,3 @@ class ClassTypesTestCase(TestBase): self.assertTrue (frame.IsValid(), "Got a valid frame.") self.assertTrue ("C::C" in frame.name, "Constructor name includes class name.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py index 866b100cbf5b..031c2b352e91 100644 --- a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py +++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py @@ -2,8 +2,9 @@ Test the lldb disassemble command on each call frame when stopped on C's ctor. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -89,9 +90,3 @@ class IterateFrameAndDisassembleTestCase(TestBase): # We should be stopped on the ctor function of class C. # self.expect("thread backtrace", BACKTRACE_DISPLAYED_CORRECTLY, # substrs = ['C::C']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/diamond/TestDiamond.py b/lldb/test/lang/cpp/diamond/TestDiamond.py index 6c9f6e4a32ae..f4222ebedfee 100644 --- a/lldb/test/lang/cpp/diamond/TestDiamond.py +++ b/lldb/test/lang/cpp/diamond/TestDiamond.py @@ -39,9 +39,3 @@ class CPPTestDiamondInheritance(TestBase): # Some compilers (for example GCC 4.4.7 and 4.6.1) emit multiple locations for the statement with the ternary # operator in the test program, while others emit only 1. lldbutil.run_break_set_by_file_and_line (self, "main.cpp", line, num_expected_locations=-1, loc_exact=False) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py index 431f19f7ae4a..f46bad7dd9c1 100644 --- a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py +++ b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py @@ -2,9 +2,11 @@ Test lldb Python API SBValue::Cast(SBType) for C++ types. """ +import lldb_shared + +import unittest2 import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -122,10 +124,3 @@ class CppValueCastTestCase(TestBase): b_member_val = instanceB.GetChildMemberWithName('m_b_val') self.DebugSBValue(b_member_val) self.assertTrue(b_member_val.GetValueAsUnsigned(error, 0) == 36) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py index f7f9e67a014e..3ef4193a9178 100644 --- a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py +++ b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py @@ -2,9 +2,10 @@ Use lldb Python API to test dynamic values in C++ """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -217,10 +218,3 @@ class DynamicValueTestCase(TestBase): contained_b_static_addr = int (contained_b_static.GetValue(), 16) self.assertTrue (contained_b_addr < contained_b_static_addr) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py index e8072efa8b26..c0fb31038926 100644 --- a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py +++ b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py @@ -1,7 +1,8 @@ """Look up enum type information and check for correct display.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -105,8 +106,3 @@ class CPP11EnumTypesTestCase(TestBase): self.expect("frame variable day", 'check for valid enumeration value', substrs = [enum_value]) lldbutil.continue_to_breakpoint (self.process(), bkpt) -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py index cc6805e8dc1c..51135c7a0a12 100644 --- a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py +++ b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py @@ -2,8 +2,9 @@ Test lldb exception breakpoint command for CPP. """ +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -60,10 +61,3 @@ class CPPBreakpointTestCase(TestBase): self.assertTrue (frame_functions.count ("throws_exception_on_even(int)") == 0, "At catch our throw function is off the stack") self.assertTrue (frame_functions.count ("intervening_function(int)") == 0, "At catch our intervening function is off the stack") self.assertTrue (frame_functions.count ("catches_exception(int)") == 1, "At catch our catch function is on the stack") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py index 6299116d19ae..68ff52eb4d1a 100644 --- a/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py +++ b/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py @@ -52,10 +52,3 @@ class TestCppGlobalOperators(TestBase): test_result = frame.EvaluateExpression("operator==(s2, s3)") self.assertTrue(test_result.IsValid() and test_result.GetValue() == "false", "operator==(s2, s3) = false") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py index 931f546c7779..2764f3116678 100644 --- a/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py +++ b/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py @@ -63,9 +63,3 @@ class TestCppIncompleteTypes(TestBase): # Get frame for current thread return thread.GetSelectedFrame() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/namespace/TestNamespace.py b/lldb/test/lang/cpp/namespace/TestNamespace.py index fd598813e83a..08825c41af5f 100644 --- a/lldb/test/lang/cpp/namespace/TestNamespace.py +++ b/lldb/test/lang/cpp/namespace/TestNamespace.py @@ -2,8 +2,9 @@ Test the printing of anonymous and named namespace variables. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -106,9 +107,3 @@ class NamespaceTestCase(TestBase): self.expect("p variadic_sum", patterns = ['\(anonymous namespace\)::variadic_sum\(int, ...\)']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/nsimport/TestCppNsImport.py b/lldb/test/lang/cpp/nsimport/TestCppNsImport.py index 076356dd1621..3411959aaa1e 100644 --- a/lldb/test/lang/cpp/nsimport/TestCppNsImport.py +++ b/lldb/test/lang/cpp/nsimport/TestCppNsImport.py @@ -98,10 +98,3 @@ class TestCppNsImport(TestBase): # Test function inside namespace test_result = frame.EvaluateExpression("fun_var") self.assertTrue(test_result.IsValid() and test_result.GetValueAsSigned() == 5, "fun_var = 5") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py index 38cec0f472e0..7eff685abcac 100644 --- a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py +++ b/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py @@ -34,9 +34,3 @@ class CPPStaticMethodsTestCase(TestBase): self.expect("expression -- Static()", startstr = "(int) $1 = 1") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py index 23bf8a122c61..4ac48e1866b4 100644 --- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py +++ b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py @@ -3,8 +3,10 @@ Test that the expression parser returns proper Unicode strings. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -79,9 +81,3 @@ class Rdar12991846TestCase(TestBase): if expr == 2: self.expect('expression u"hello"', substrs = ['hello']) if expr == 3: self.expect('expression U"hello"', substrs = ['hello']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py index ea9d135a224d..2f62be57910e 100644 --- a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py +++ b/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py @@ -47,9 +47,3 @@ class RvalueReferencesTestCase(TestBase): def set_breakpoint(self, line): lldbutil.run_break_set_by_file_and_line (self, "main.cpp", line, num_expected_locations=1, loc_exact=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/scope/TestCppScope.py b/lldb/test/lang/cpp/scope/TestCppScope.py index 4d5ea8bf62bc..f984eed86e4a 100644 --- a/lldb/test/lang/cpp/scope/TestCppScope.py +++ b/lldb/test/lang/cpp/scope/TestCppScope.py @@ -65,9 +65,3 @@ class TestCppScopes(TestBase): value = frame.EvaluateExpression(name) assert_value = global_variables_assert[name] self.assertTrue(value.IsValid() and value.GetValueAsSigned() == assert_value, name + " = " + str(assert_value)) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py index 9c1f6838efd9..8ae2e22c52b1 100644 --- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py +++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py @@ -2,9 +2,10 @@ Test that variables with signed types display correctly. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -55,10 +56,3 @@ class UnsignedTypesTestCase(TestBase): substrs = ["(int) the_signed_int = 99", "(long) the_signed_long = 99", "(long long) the_signed_long_long = 99"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py index de85a574899c..f221a1a5bb10 100644 --- a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py +++ b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py @@ -1,6 +1,10 @@ """ Tests that C++ member and static variables have correct layout and scope. """ + +import lldb_shared + +import unittest2 import lldb from lldbtest import * import lldbutil @@ -51,10 +55,3 @@ class CPPStaticMembersTestCase(TestBase): def set_breakpoint(self, line): lldbutil.run_break_set_by_file_and_line (self, "main.cpp", line, num_expected_locations=1, loc_exact=False) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py index c44af758c72c..4887a69788dc 100644 --- a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py +++ b/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py @@ -34,9 +34,3 @@ class CPPStaticMethodsTestCase(TestBase): self.expect("expression -- my_a.getMemberValue()", startstr = "(int) $1 = 3") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py index b74009fbefde..e32652602f89 100644 --- a/lldb/test/lang/cpp/stl/TestSTL.py +++ b/lldb/test/lang/cpp/stl/TestSTL.py @@ -2,8 +2,10 @@ Test some expressions involving STL data types. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import lldbutil from lldbtest import * @@ -112,10 +114,3 @@ class STLTestCase(TestBase): # Check that both entries of the dictionary have 'True' as the value. self.assertTrue(all(expected_types.values())) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py index abcc3004a4ae..dad5bf21eca3 100644 --- a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py +++ b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py @@ -2,8 +2,10 @@ Test the lldb disassemble command on lib stdc++. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -104,10 +106,3 @@ class StdCXXDisassembleTestCase(TestBase): else: # This entry is not a Code entry. Reset SA = None. SA = None - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/this/TestCPPThis.py b/lldb/test/lang/cpp/this/TestCPPThis.py index e4b5d6151210..4c99845b31a8 100644 --- a/lldb/test/lang/cpp/this/TestCPPThis.py +++ b/lldb/test/lang/cpp/this/TestCPPThis.py @@ -51,9 +51,3 @@ class CPPThisTestCase(TestBase): def set_breakpoint(self, line): lldbutil.run_break_set_by_file_and_line (self, "main.cpp", line, num_expected_locations=1, loc_exact=False) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py index c251563228af..a1c9f25d31b3 100644 --- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py +++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py @@ -2,7 +2,8 @@ Test that template instaniations of std::vector and in the same module have the correct types. """ -import unittest2 +import lldb_shared + import lldb import lldbutil from lldbtest import * @@ -57,10 +58,3 @@ class UniqueTypesTestCase(TestBase): continue self.expect(x, "Expect type 'short'", exe=False, substrs = ['short']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py index d49d3b8f4df3..a2c8ff75f044 100644 --- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py +++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py @@ -2,9 +2,10 @@ Test that variables with unsigned types display correctly. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * import lldbutil @@ -49,10 +50,3 @@ class UnsignedTypesTestCase(TestBase): "(unsigned long) the_unsigned_long = 99", "(unsigned long long) the_unsigned_long_long = 99", "(uint32_t) the_uint32 = 99"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py index 2438873b5154..d2b3ab91ba39 100644 --- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py +++ b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py @@ -3,8 +3,9 @@ Test that C++ supports wchar_t correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -69,9 +70,3 @@ class CxxWCharTTestCase(TestBase): self.expect('frame variable wchar_zero', substrs=["L'\\0'"]) self.expect('expression wchar_zero', substrs=["L'\\0'"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/go/goroutines/TestGoroutines.py b/lldb/test/lang/go/goroutines/TestGoroutines.py index 05f6aa8f0b0e..6c26a3a1075e 100644 --- a/lldb/test/lang/go/goroutines/TestGoroutines.py +++ b/lldb/test/lang/go/goroutines/TestGoroutines.py @@ -1,7 +1,8 @@ """Test the Go OS Plugin.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -80,10 +81,3 @@ class TestGoASTContext(TestBase): self.dbg.HandleCommand("settings set plugin.os.goroutines.enable false") self.thread().StepInstruction(False) self.assertLess(len(self.process().threads), 20) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/go/types/TestGoASTContext.py b/lldb/test/lang/go/types/TestGoASTContext.py index ccfca85a130d..457b6d306394 100644 --- a/lldb/test/lang/go/types/TestGoASTContext.py +++ b/lldb/test/lang/go/types/TestGoASTContext.py @@ -1,7 +1,8 @@ """Test the go DWARF type parsing.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -128,10 +129,3 @@ class TestGoASTContext(TestBase): self.assertEqual(5, v.GetNumChildren()) for i in xrange(5): self.assertEqual(str(i + 1), v.GetChildAtIndex(i).value) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/mixed/TestMixedLanguages.py b/lldb/test/lang/mixed/TestMixedLanguages.py index 5d4e284d4fd5..1fbf118838a5 100644 --- a/lldb/test/lang/mixed/TestMixedLanguages.py +++ b/lldb/test/lang/mixed/TestMixedLanguages.py @@ -1,7 +1,8 @@ """Test that lldb works correctly on compile units form different languages.""" +import lldb_shared + import os, time, re -import unittest2 import lldb from lldbtest import * @@ -51,9 +52,3 @@ class MixedLanguagesTestCase(TestBase): # (note: C++11 is enabled by default for C++). self.expect("expr foo != nullptr", patterns = ["true"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py index 281c15505dbe..a629dcf38ea7 100644 --- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -1,7 +1,8 @@ """Test printing ivars and ObjC objects captured in blocks that are made in methods of an ObjC class.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -98,9 +99,3 @@ class TestObjCIvarsInBlocks(TestBase): ret_value_signed = expr.GetValueAsSigned (error) # print 'ret_value_signed = %i' % (ret_value_signed) self.assertTrue (ret_value_signed == 5, "The local variable in the block was what we expected.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py index 4b21e35e22d4..6c2f109cb8ed 100644 --- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py +++ b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py @@ -1,7 +1,8 @@ """Test that a forward-declared class works when its complete definition is in a library""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -49,9 +50,3 @@ class ForwardDeclTestCase(TestBase): # This should display correctly. self.expect("expression [j getMember]", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["= 0x"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestConstStrings.py b/lldb/test/lang/objc/foundation/TestConstStrings.py index a3780e09a752..772f5d7ce015 100644 --- a/lldb/test/lang/objc/foundation/TestConstStrings.py +++ b/lldb/test/lang/objc/foundation/TestConstStrings.py @@ -3,8 +3,9 @@ Test that objective-c constant strings are generated correctly by the expression parser. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -48,10 +49,3 @@ class ConstStringTestCase(TestBase): self.expect('expression (int)[@"123" length]', startstr = "(int) $3 = 3") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py index 3fb67924f7d5..cd03e76ad11b 100644 --- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py +++ b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py @@ -2,8 +2,10 @@ Test the lldb disassemble command on foundation framework. """ -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -128,10 +130,3 @@ class FoundationDisassembleTestCase(TestBase): # Do the disassemble for the currently stopped function. self.runCmd("disassemble -f") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py index 5be2e3c441a1..1417d017a695 100644 --- a/lldb/test/lang/objc/foundation/TestObjCMethods.py +++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py @@ -3,8 +3,9 @@ Set breakpoints on objective-c class and instance methods in foundation. Also lookup objective-c data types and evaluate expressions. """ +import lldb_shared + import os, os.path, time -import unittest2 import lldb import string from lldbtest import * @@ -79,7 +80,6 @@ class FoundationTestCase(TestBase): self.expect("thread backtrace", "Stop at -[NSAutoreleasePool release]", substrs = ["Foundation`-[NSAutoreleasePool release]"]) - #@unittest2.expectedFailure # rdar://problem/8542091 # rdar://problem/8492646 def test_data_type_and_expr(self): @@ -258,9 +258,3 @@ class FoundationTestCase(TestBase): print line, self.assertTrue(num_errors == 0, "Spurious lookups detected") f.close() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/lang/objc/foundation/TestObjCMethods2.py index 59eb9955c3c1..9c6ce04d05ae 100644 --- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py +++ b/lldb/test/lang/objc/foundation/TestObjCMethods2.py @@ -2,8 +2,9 @@ Test more expression command sequences with objective-c. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -164,9 +165,3 @@ class FoundationTestCase2(TestBase): error = True, patterns = ["no known method", "cast the message send to the method's return type"]) self.runCmd("process continue") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py index 083103290963..6dd9b90e2012 100644 --- a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py +++ b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py @@ -2,9 +2,10 @@ Test SBValue.GetObjectDescription() with the value from SBTarget.FindGlobalVariables(). """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -65,10 +66,3 @@ class ObjectDescriptionAPITestCase(TestBase): print "object description:", v.GetObjectDescription() if v.GetName() == 'my_global_str': self.assertTrue(v.GetObjectDescription() == 'This is a global string') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py index 55e9713462f0..a302fcc16e0e 100644 --- a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py +++ b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py @@ -2,8 +2,9 @@ Test that Objective-C methods from the runtime work correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -43,9 +44,3 @@ class RuntimeTypesTestCase(TestBase): self.expect("po $1", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["foo"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/foundation/TestSymbolTable.py b/lldb/test/lang/objc/foundation/TestSymbolTable.py index 0d238160214d..3b1d820012d6 100644 --- a/lldb/test/lang/objc/foundation/TestSymbolTable.py +++ b/lldb/test/lang/objc/foundation/TestSymbolTable.py @@ -2,8 +2,9 @@ Test symbol table access for main.m. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -63,10 +64,3 @@ class FoundationSymtabTestCase(TestBase): #print "symbols unaccounted for:", expected_symbols self.assertTrue(len(expected_symbols) == 0, "All the known symbols are accounted for") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py index 294265059146..a36ba61c4026 100644 --- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py +++ b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py @@ -1,7 +1,9 @@ """Test that hidden ivars in a shared library are visible from the main executable.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -168,10 +170,3 @@ class HiddenIvarsTestCase(TestBase): else: self.expect("frame variable *k", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["foo = 2", "bar = 3", '_filteredDataSource = 0x', '"2 elements"']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py index b614d753b13f..2ccd8bc15748 100644 --- a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py +++ b/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py @@ -2,9 +2,10 @@ Test that dynamically discovered ivars of type IMP do not crash LLDB """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * import commands @@ -57,9 +58,3 @@ class ObjCiVarIMPTestCase(TestBase): self.expect('disassemble --start-address `((MyClass*)object)->myImp`', substrs=[ '-[MyClass init]' ]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py index 8a11c24e4011..a836cdaf82cd 100644 --- a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py +++ b/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py @@ -1,7 +1,9 @@ """Test that importing modules in Objective-C works as expected.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import platform import lldbutil @@ -47,9 +49,3 @@ class ObjCModulesAutoImportTestCase(TestBase): self.expect("p getpid()", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["pid_t"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py index 60bb82da2c60..0db2a114c6e5 100644 --- a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py +++ b/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py @@ -1,7 +1,9 @@ """Test that DWARF types are trusted over module types""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import platform import lldbutil @@ -55,9 +57,3 @@ class IncompleteModulesTestCase(TestBase): self.expect("expr MAX(2,3)", "#undefd macro was correcltly not found", error=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py index 02ac9d795146..b322cf045abb 100644 --- a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py +++ b/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py @@ -1,7 +1,9 @@ """Test that inline functions from modules are imported correctly""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import platform import lldbutil @@ -48,9 +50,3 @@ class ModulesInlineFunctionsTestCase(TestBase): self.expect("expr isInline(2)", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["4"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/modules/TestObjCModules.py b/lldb/test/lang/objc/modules/TestObjCModules.py index b3a5d1395ae9..aa3351af3f3a 100644 --- a/lldb/test/lang/objc/modules/TestObjCModules.py +++ b/lldb/test/lang/objc/modules/TestObjCModules.py @@ -1,7 +1,9 @@ """Test that importing modules in Objective-C works as expected.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import platform import lldbutil @@ -65,9 +67,3 @@ class ObjCModulesTestCase(TestBase): self.expect("p [NSURL URLWithString:@\"http://lldb.llvm.org\"].scheme", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["http"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc++/TestObjCXX.py b/lldb/test/lang/objc/objc++/TestObjCXX.py index 1ae73bd463c9..2c5b32010f83 100644 --- a/lldb/test/lang/objc/objc++/TestObjCXX.py +++ b/lldb/test/lang/objc/objc++/TestObjCXX.py @@ -2,8 +2,9 @@ Make sure that ivars of Objective-C++ classes are visible in LLDB. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -28,9 +29,3 @@ class ObjCXXTestCase(TestBase): self.expect("expr f->f", "Found ivar in class", substrs = ["= 3"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py index f7d8d5b6d245..da4b146e381c 100644 --- a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py +++ b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py @@ -2,9 +2,10 @@ Use lldb Python API to test base class resolution for ObjC classes """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -52,9 +53,3 @@ class ObjCDynamicValueTestCase(TestBase): self.assertTrue(var_pte_type.GetDirectBaseClassAtIndex(0).IsValid(), "Foo * has a valid base class") self.assertTrue(var_ptr_type.GetDirectBaseClassAtIndex(0).GetName() == var_pte_type.GetDirectBaseClassAtIndex(0).GetName(), "Foo and its pointer type don't agree on their base class") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py index f07adb6ae3e9..eeedc9b81179 100644 --- a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py +++ b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py @@ -1,7 +1,8 @@ """Test that the expression parser doesn't get confused by 'id' and 'Class'""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -50,9 +51,3 @@ class TestObjCBuiltinTypes(TestBase): self.expect("expr (foo)", patterns = ["\(ns::id\) \$.* = 0"]) self.expect("expr id my_id = 0; my_id", patterns = ["\(id\) \$.* = nil"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py index 8f816c516f1d..15820b687393 100644 --- a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py +++ b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py @@ -2,9 +2,10 @@ Use lldb Python API to make sure the dynamic checkers are doing their jobs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -69,9 +70,3 @@ class ObjCCheckerTestCase(TestBase): # Make sure the error is helpful: err_string = expr_error.GetCString() self.assertTrue ("selector" in err_string) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py index 27b091563f1a..70cb513f9b7f 100644 --- a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py +++ b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py @@ -1,7 +1,8 @@ """Test calling functions in class methods.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -51,9 +52,3 @@ class TestObjCClassMethod(TestBase): cmd_value = frame.EvaluateExpression ("(int)[Foo doSomethingWithString:@\"Hello\"]") self.assertTrue (cmd_value.IsValid()) self.assertTrue (cmd_value.GetValueAsUnsigned() == 5) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py index 27f6da1bf9f0..9e4a7e2a7df1 100644 --- a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py +++ b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py @@ -2,8 +2,9 @@ Test that we are able to properly report a usable dynamic type """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -57,9 +58,3 @@ class ObjCDynamicSBTypeTestCase(TestBase): self.assertTrue(object_pointee_type.GetNumberOfFields() == 2, "The dynamic type for NSObject has 2 fields") self.assertTrue(base_pointee_type.GetNumberOfFields() == 2, "The dynamic type for Base has 2 fields") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py index 37a7b078cadb..bd0bbeab4f69 100644 --- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py +++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py @@ -2,9 +2,10 @@ Use lldb Python API to test dynamic values in ObjC """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -171,9 +172,3 @@ class ObjCDynamicValueTestCase(TestBase): derivedValue = object.GetChildMemberWithName ('_derivedValue') self.assertTrue (derivedValue) self.assertTrue (int (derivedValue.GetValue(), 0) == 30) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py index 98d6aa5a1a0f..26e09da2ae38 100644 --- a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py +++ b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py @@ -1,7 +1,8 @@ """Test printing ObjC objects that use unbacked properties - so that the static ivar offsets are incorrect.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -69,9 +70,3 @@ class TestObjCIvarOffsets(TestBase): flag2_value = mine_flag2.GetValueAsUnsigned (error) self.assertTrue (error.Success()) self.assertTrue (flag2_value == 7) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py index 05cdc4d03dc6..dd4620f4752a 100644 --- a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py +++ b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py @@ -1,7 +1,8 @@ """Test printing ObjC objects that use unbacked properties - so that the static ivar offsets are incorrect.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -54,9 +55,3 @@ class TestObjCIvarStripped(TestBase): ivar_value = ivar.GetValueAsSigned (error) self.assertTrue (error.Success()) self.assertTrue (ivar_value == 3) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py index 97d8f92b33bf..66dc4d5bdb88 100644 --- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py +++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py @@ -1,7 +1,9 @@ """Test that the Objective-C syntax for dictionary/array literals and indexing works""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import platform import lldbutil @@ -97,9 +99,3 @@ class ObjCNewSyntaxTestCase(TestBase): substrs = ["4"]) self.expect("expr -- @((char*)\"Hello world\" + 6)", VARIABLES_DISPLAYED_CORRECTLY, substrs = ["NSString", "world"]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py index e6a5958d2c10..a2769e244b5c 100644 --- a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py +++ b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py @@ -7,8 +7,9 @@ or 'self' variable was not properly read if the compiler optimized it into a register. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -58,10 +59,3 @@ class ObjcOptimizedTestCase(TestBase): self.expect('expression self->non_member', error=True, substrs = ["does not have a member named 'non_member'"]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/lang/objc/objc-property/TestObjCProperty.py index 0ed08363163f..f21ab3498623 100644 --- a/lldb/test/lang/objc/objc-property/TestObjCProperty.py +++ b/lldb/test/lang/objc/objc-property/TestObjCProperty.py @@ -2,9 +2,10 @@ Use lldb Python API to verify that expression evaluation for property references uses the correct getters and setters """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -108,9 +109,3 @@ class ObjCPropertyTestCase(TestBase): idWithProtocol_error = idWithProtocol_value.GetError() self.assertTrue (idWithProtocol_error.Success()) self.assertTrue (idWithProtocol_value.GetTypeName() == "id") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py index 6cc550aa10b8..a0719871a13b 100644 --- a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py +++ b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py @@ -1,7 +1,8 @@ """Test calling functions in static methods with a stripped binary.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -60,9 +61,3 @@ class TestObjCStaticMethodStripped(TestBase): self.assertTrue (cmd_value.IsValid()) string_length = cmd_value.GetValueAsUnsigned() self.assertTrue (string_length == 27, "Got the right value from another class method on the same class.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py index c54d23b61051..443c4c5af415 100644 --- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py +++ b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py @@ -1,7 +1,8 @@ """Test calling functions in static methods.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -56,9 +57,3 @@ class TestObjCStaticMethod(TestBase): self.assertTrue (cmd_value.IsValid()) string_length = cmd_value.GetValueAsUnsigned() self.assertTrue (string_length == 27, "Got the right value from another class method on the same class.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py index 0fb8bcebe915..015992ccbf3d 100644 --- a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py +++ b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py @@ -1,7 +1,8 @@ """Test stepping through ObjC method dispatch in various forms.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -167,9 +168,3 @@ class TestObjCStepping(TestBase): thread.StepInto() line_number = thread.GetFrameAtIndex(0).GetLineEntry().GetLine() self.assertTrue (line_number == self.stepped_past_nil_line, "Step in over dispatch to nil stepped over.") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py index 47d1ea432b40..be6e87b939e9 100644 --- a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py +++ b/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py @@ -1,7 +1,8 @@ """Test passing structs to Objective-C methods.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -52,9 +53,3 @@ class TestObjCStructArgument(TestBase): # Now make sure we can call a method that returns a struct without crashing. cmd_value = frame.EvaluateExpression ("[provider getRange]") self.assertTrue (cmd_value.IsValid()) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py index 27a3c3e509e4..d6fafd7e3480 100644 --- a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py +++ b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py @@ -1,7 +1,8 @@ """Test calling functions in class methods.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -48,9 +49,3 @@ class TestObjCClassMethod(TestBase): # Now make sure we can call a method that returns a struct without crashing. cmd_value = frame.EvaluateExpression ("[provider getRange]") self.assertTrue (cmd_value.IsValid()) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/lang/objc/objc-super/TestObjCSuper.py index 1d1f43be37f6..4aba9e9740b2 100644 --- a/lldb/test/lang/objc/objc-super/TestObjCSuper.py +++ b/lldb/test/lang/objc/objc-super/TestObjCSuper.py @@ -1,7 +1,8 @@ """Test calling methods on super.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -54,9 +55,3 @@ class TestObjCSuperMethod(TestBase): cmd_value = frame.EvaluateExpression ("[super get]") self.assertTrue (cmd_value.IsValid()) self.assertTrue (cmd_value.GetValueAsUnsigned() == 1) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/print-obj/TestPrintObj.py b/lldb/test/lang/objc/print-obj/TestPrintObj.py index f6143b04e8d8..b1205cfa8b30 100644 --- a/lldb/test/lang/objc/print-obj/TestPrintObj.py +++ b/lldb/test/lang/objc/print-obj/TestPrintObj.py @@ -2,8 +2,9 @@ Test "print object" where another thread blocks the print object from making progress. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -82,10 +83,3 @@ class PrintObjTestCase(TestBase): self.expect("po lock_me", OBJECT_PRINTED_CORRECTLY, substrs = ['I am pretty special.']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py index b33741b4f46f..726ec820bb5c 100644 --- a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py +++ b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py @@ -2,8 +2,9 @@ Test that objective-c method returning BOOL works correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -40,10 +41,3 @@ class MethodReturningBOOLTestCase(TestBase): # rdar://problem/9691614 self.runCmd('p (int)[my isValid]') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py index 17d1015701ae..be9b6cf043a3 100644 --- a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py +++ b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py @@ -2,8 +2,9 @@ Test that CoreFoundation classes CFGregorianDate and CFRange are not improperly uniqued """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -39,9 +40,3 @@ class Rdar10967107TestCase(TestBase): self.expect("frame variable cf_range --raw", substrs = ['location','length']) # check that printing both does not somehow confuse LLDB self.expect("frame variable --raw", substrs = ['year','month','day','hour','minute','second','location','length']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py index 14f85c42b826..3523695de2c4 100644 --- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py +++ b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py @@ -2,8 +2,9 @@ Test that we do not attempt to make a dynamic type for a 'const char*' """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -60,9 +61,3 @@ class Rdar10967107TestCase(TestBase): # check that expr also gets it right self.expect("expr my_foolie", substrs = ['FoolMeOnce *']) self.expect("expr -d run -- my_foolie", substrs = ['FoolMeOnce *']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py index d1d2292ac2e9..54fa80c5596a 100644 --- a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py +++ b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py @@ -2,8 +2,9 @@ Test that we are able to find out how many children NSWindow has """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -40,9 +41,3 @@ class Rdar12408181TestCase(TestBase): self.assertTrue(window_dynamic.GetNumChildren() > 1, "NSWindow (dynamic) only has 1 child!") self.assertTrue(window.GetChildAtIndex(0).IsValid(), "NSWindow (static) has an invalid child") self.assertTrue(window_dynamic.GetChildAtIndex(0).IsValid(), "NSWindow (dynamic) has an invalid child") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/lang/objc/real-definition/TestRealDefinition.py index 8557423324dd..04e498687107 100644 --- a/lldb/test/lang/objc/real-definition/TestRealDefinition.py +++ b/lldb/test/lang/objc/real-definition/TestRealDefinition.py @@ -1,7 +1,8 @@ """Test that types defined in shared libraries work correctly.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -81,9 +82,3 @@ class TestRealDefinition(TestBase): # Break inside the foo function which takes a bar_ptr argument. line = line_number('main.m', '// Set breakpoint in main') lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lang/objc/self/TestObjCSelf.py b/lldb/test/lang/objc/self/TestObjCSelf.py index 239e2de644f6..44736feaba3d 100644 --- a/lldb/test/lang/objc/self/TestObjCSelf.py +++ b/lldb/test/lang/objc/self/TestObjCSelf.py @@ -34,9 +34,3 @@ class ObjCSelfTestCase(TestBase): def set_breakpoint(self, line): lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py index 61e92a05ef90..3f7641bf6d20 100644 --- a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py +++ b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py @@ -3,8 +3,9 @@ Test lldb ability to unwind a stack with a function containing a call to the '__builtin_trap' intrinsic, which GCC (4.6) encodes to an illegal opcode. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -46,9 +47,3 @@ class BuiltinTrapTestCase(TestBase): # evaluate a local self.expect('p foo', substrs = ['= 5']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py index 65c145f6eb5b..8bcf39e4696d 100644 --- a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py +++ b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py @@ -3,8 +3,9 @@ This tests that we do not lose control of the inferior, while doing an instructi over a thread creation instruction. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -61,9 +62,3 @@ class CreateDuringInstructionStepTestCase(TestBase): # At this point, the inferior process should have exited. self.assertEqual(process.GetState(), lldb.eStateExited, PROCESS_EXITED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/lldbinline.py b/lldb/test/lldbinline.py index 0051c75b320b..3503e8bb0c46 100644 --- a/lldb/test/lldbinline.py +++ b/lldb/test/lldbinline.py @@ -4,7 +4,6 @@ import lldb from lldbtest import * import lldbutil import os -import unittest2 import sys def source_type(filename): diff --git a/lldb/test/lldbpexpect.py b/lldb/test/lldbpexpect.py index 6563744d92bc..f25534efaf1c 100644 --- a/lldb/test/lldbpexpect.py +++ b/lldb/test/lldbpexpect.py @@ -1,8 +1,9 @@ +import lldb_shared + import lldb from lldbtest import * import lldbutil import os -import unittest2 import sys import pexpect diff --git a/lldb/test/logging/TestLogging.py b/lldb/test/logging/TestLogging.py index a76c149893de..ae8398f250e5 100644 --- a/lldb/test/logging/TestLogging.py +++ b/lldb/test/logging/TestLogging.py @@ -2,8 +2,9 @@ Test lldb logging. This test just makes sure logging doesn't crash, and produces some output. """ +import lldb_shared + import os, time, string -import unittest2 import lldb from lldbtest import * @@ -102,10 +103,3 @@ class LogTestCase(TestBase): # check that it is still there self.assertTrue(string.find(contents, "bacon") == 0) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() - diff --git a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py index 3907e445da20..5dae2a06c83a 100644 --- a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py +++ b/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py @@ -1,7 +1,8 @@ """Test that the 'add-dsym', aka 'target symbols add', succeeds in the middle of debug session.""" +import lldb_shared + import os, time -import unittest2 import lldb import sys from lldbtest import * @@ -40,9 +41,3 @@ class AddDsymMidExecutionCommandCase(TestBase): self.expect("frame select", substrs = ['a.out`main at main.c']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py index 3ff481f86f91..6e739f599b1d 100644 --- a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py +++ b/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py @@ -2,8 +2,9 @@ Test that clang produces the __apple accelerator tables, for example, __apple_types, correctly. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * from lldbutil import symbol_type_to_str @@ -62,10 +63,3 @@ class AppleTypesTestCase(TestBase): self.assertTrue(dwarf_section.FindSubSection("__apple_names") and dwarf_section.FindSubSection("__apple_namespac") and dwarf_section.FindSubSection("__apple_objc")) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py index c28d0473ee34..7f1fabc14280 100644 --- a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py +++ b/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py @@ -1,7 +1,8 @@ """Test stepping and setting breakpoints in indirect and re-exported symbols.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -83,11 +84,3 @@ class TestIndirectFunctions(TestBase): self.assertTrue (len(threads) == 1, "Stopped at breakpoint in reexported function target.") curr_function = thread.GetFrameAtIndex(0).GetFunctionName() self.assertTrue (curr_function == "call_through_indirect_hidden", "Stepped into indirect symbols.") - - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/order/TestOrderFile.py b/lldb/test/macosx/order/TestOrderFile.py index d8b7f37f26bd..b0d9fd93586d 100644 --- a/lldb/test/macosx/order/TestOrderFile.py +++ b/lldb/test/macosx/order/TestOrderFile.py @@ -2,9 +2,10 @@ Test that debug symbols have the correct order as specified by the order file. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * @@ -31,9 +32,3 @@ class OrderFileTestCase(TestBase): "Symbols have correct order by the order file") self.runCmd("run", RUN_COMPLETED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/queues/TestQueues.py b/lldb/test/macosx/queues/TestQueues.py index b15c38aa0963..82149e354430 100644 --- a/lldb/test/macosx/queues/TestQueues.py +++ b/lldb/test/macosx/queues/TestQueues.py @@ -1,7 +1,9 @@ """Test queues inspection SB APIs.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb import lldbutil from lldbtest import * @@ -237,9 +239,3 @@ class TestQueues(TestBase): self.assertTrue(queue_performer_2.GetPendingItemAtIndex(9998).IsValid(), "queue 2's pending item #9998 is valid") self.assertTrue(queue_performer_2.GetPendingItemAtIndex(9998).GetAddress().GetSymbol().GetName() == "doing_the_work_2", "queue 2's pending item #0 should be doing_the_work_2") self.assertTrue(queue_performer_2.GetPendingItemAtIndex(9999).IsValid() == False, "queue 2's pending item #9999 is invalid") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py index 8299bd28429b..6e777904df36 100644 --- a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py +++ b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py @@ -1,7 +1,8 @@ """Test function call thread safety.""" +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -58,9 +59,3 @@ class TestSafeFuncCalls(TestBase): def safe_to_call_func_on_select_thread (self, select_thread): self.assertTrue(select_thread.SafeToCallFunctions() == False, "It is not safe to call functions on the select thread") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py index 7c3decfa92ca..9628c5385878 100644 --- a/lldb/test/macosx/universal/TestUniversal.py +++ b/lldb/test/macosx/universal/TestUniversal.py @@ -1,7 +1,9 @@ """Test aspects of lldb commands on universal binaries.""" -import os, time +import lldb_shared + import unittest2 +import os, time import lldb from lldbtest import * import lldbutil @@ -101,10 +103,3 @@ class UniversalTestCase(TestBase): substrs = ['Name: eax']) self.runCmd("continue") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py index 764fe22c1902..9c29e6cd9922 100644 --- a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py +++ b/lldb/test/python_api/breakpoint/TestBreakpointAPI.py @@ -2,9 +2,10 @@ Test SBBreakpoint APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -39,10 +40,3 @@ class BreakpointAPITestCase(TestBase): # Finally make sure the original breakpoint is no longer valid. self.assertTrue (not breakpoint, "Breakpoint we deleted is no longer valid.") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py index 1361c7878397..90e79dc1a7a8 100644 --- a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py +++ b/lldb/test/python_api/class_members/TestSBTypeClassMembers.py @@ -2,9 +2,10 @@ Test SBType APIs to fetch member function types. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -71,9 +72,3 @@ class SBTypeMemberFunctionsTest(TestBase): self.assertTrue(Thingy.GetMemberFunctionAtIndex(0).GetReturnType().GetName() == "id", "Thingy::init returns an id") self.assertTrue(Thingy.GetMemberFunctionAtIndex(1).GetNumberOfArguments() == 2, "Thingy::foo takes two arguments") self.assertTrue(Thingy.GetMemberFunctionAtIndex(1).GetArgumentTypeAtIndex(0).GetName() == "int", "Thingy::foo takes an int") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py index 147ad8a1a1f2..e7b141ebaf51 100644 --- a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py +++ b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py @@ -11,9 +11,10 @@ SBCommadnReturnObject, SBStream, and SBSymbolContextList, are all valid objects after default construction. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -387,10 +388,3 @@ class APIDefaultConstructorTestCase(TestBase): # Do fuzz testing on the invalid obj, it should not crash lldb. import sb_watchpoint sb_watchpoint.fuzz_obj(obj) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py index 51da105ea7a4..e16c6f094371 100644 --- a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py +++ b/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py @@ -2,9 +2,10 @@ Use lldb Python API to disassemble raw machine code bytes """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -33,9 +34,3 @@ class DisassembleRawDataTestCase(TestBase): self.assertTrue (inst.GetMnemonic(target) == "movq") self.assertTrue (inst.GetOperands(target) == '%' + "rsp, " + '%' + "rbp") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py index 4bd4367e096a..d25dabc6e631 100644 --- a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py +++ b/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py @@ -2,9 +2,10 @@ Use lldb Python API to disassemble raw machine code bytes """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -52,10 +53,3 @@ class Disassemble_VST1_64(TestBase): print "Disassembled%s" % str(inst) self.assertTrue (inst.GetMnemonic(target) == "vst1.64") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/event/TestEvents.py b/lldb/test/python_api/event/TestEvents.py index cc7440815181..f2d52570d25d 100644 --- a/lldb/test/python_api/event/TestEvents.py +++ b/lldb/test/python_api/event/TestEvents.py @@ -2,9 +2,10 @@ Test lldb Python event APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -280,9 +281,3 @@ class EventAPITestCase(TestBase): # The final judgement. :-) self.assertTrue(self.state == 'stopped', "Both expected state changed events received") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py index a2a433f44ea5..c5bdcb89fecf 100644 --- a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py +++ b/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py @@ -1,7 +1,8 @@ """Test that SBFrame::FindValue finds things but does not duplicate the entire variables list""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -45,9 +46,3 @@ class SBFrameFindValueTestCase(TestBase): self.assertTrue(self.frame.GetVariables(True,True,False,True).GetSize() == 2, "variable count is off after failed FindValue()") self.assertTrue(self.frame.FindValue("a",lldb.eValueTypeVariableArgument,lldb.eDynamicCanRunTarget).IsValid(), "FindValue() didn't find an argument") self.assertTrue(self.frame.GetVariables(True,True,False,True).GetSize() == 2, "variable count is off after successful FindValue()") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/python_api/formatters/TestFormattersSBAPI.py index 804f504b3da8..b6d693ff1fda 100644 --- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py +++ b/lldb/test/python_api/formatters/TestFormattersSBAPI.py @@ -1,7 +1,8 @@ """Test Python APIs for working with formatters""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -339,10 +340,3 @@ class SBFormattersAPITestCase(TestBase): if self.TraceOn(): print int_vector self.assertTrue(int_vector.GetNumChildren() == 0, 'synthetic vector is still empty') - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/test/python_api/frame/TestFrames.py index 42fa8b9d1f43..b13edd09396b 100644 --- a/lldb/test/python_api/frame/TestFrames.py +++ b/lldb/test/python_api/frame/TestFrames.py @@ -7,7 +7,6 @@ import lldb_shared import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -200,10 +199,3 @@ class FrameAPITestCase(TestBase): # The latest two frames should not be equal. self.assertFalse(frameOutOfC.IsEqual(frameNow)) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py index 98bd8e601097..e5e53918190c 100644 --- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py +++ b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py @@ -2,9 +2,10 @@ Testlldb Python SBFrame APIs IsInlined() and GetFunctionName(). """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -73,9 +74,3 @@ class InlinedFrameAPITestCase(TestBase): print stack_traces2 self.expect(stack_traces2, "Second stop at %s:%d" % (self.source, self.second_stop), exe=False, substrs = ['%s:%d' % (self.source, self.second_stop)]) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/python_api/function_symbol/TestDisasmAPI.py index c8e079fd299d..4018b52ea73b 100644 --- a/lldb/test/python_api/function_symbol/TestDisasmAPI.py +++ b/lldb/test/python_api/function_symbol/TestDisasmAPI.py @@ -2,9 +2,10 @@ Test retrieval of SBAddress from function/symbol, disassembly, and SBAddress APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -105,9 +106,3 @@ class DisasmAPITestCase(TestBase): desc2 = get_description(sa2) self.assertTrue(desc1 and desc2 and desc1 == desc2, "SBAddress.GetDescription() API of sa1 and sa2 should return the same string") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/python_api/function_symbol/TestSymbolAPI.py index b363c1aaaed8..1d7a428ddf44 100644 --- a/lldb/test/python_api/function_symbol/TestSymbolAPI.py +++ b/lldb/test/python_api/function_symbol/TestSymbolAPI.py @@ -2,9 +2,10 @@ Test newly added SBSymbol and SBAddress APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -75,10 +76,3 @@ class SymbolAPITestCase(TestBase): if self.TraceOn(): print "UUID:", addr_line1.GetModule().GetUUIDString() self.assertTrue(addr_line1.GetModule().GetUUIDString() == addr_line2.GetModule().GetUUIDString()) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/hello_world/TestHelloWorld.py b/lldb/test/python_api/hello_world/TestHelloWorld.py index 8e586c8dcdf8..1800dd0fb698 100644 --- a/lldb/test/python_api/hello_world/TestHelloWorld.py +++ b/lldb/test/python_api/hello_world/TestHelloWorld.py @@ -1,7 +1,8 @@ """Test Python APIs for target (launch and attach), breakpoint, and process.""" +import lldb_shared + import os, sys, time -import unittest2 import lldb import time from lldbtest import * @@ -139,9 +140,3 @@ class HelloWorldTestCase(TestBase): self.expect(stacktraces, exe=False, substrs = ['main.c:%d' % self.line2, '(int)argc=3']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py index b617a617e870..1f5171d1018b 100644 --- a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py +++ b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py @@ -1,7 +1,8 @@ """Test the SBCommandInterpreter APIs.""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -68,10 +69,3 @@ class CommandInterpreterAPICase(TestBase): if self.TraceOn(): lldbutil.print_stacktraces(process) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py index 4b0c460ad694..28121365b753 100644 --- a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py +++ b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py @@ -2,8 +2,9 @@ Test utility functions for the frame object. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -54,10 +55,3 @@ class FrameUtilsTestCase(TestBase): lldbutil.print_stacktrace(thread) print "Current frame: %s" % frame0_args print "Parent frame: %s" % parent_args - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py index 124f7031597c..c8ee37c16614 100644 --- a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py +++ b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py @@ -2,9 +2,10 @@ Test the iteration protocol for some lldb container objects. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * @@ -117,9 +118,3 @@ class LLDBIteratorTestCase(TestBase): print frame self.assertTrue(stopped_due_to_breakpoint) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py index 32d660e5950a..0a49bc2fe4ae 100644 --- a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py +++ b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py @@ -2,9 +2,10 @@ Test the iteration protocol for frame registers. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * @@ -89,10 +90,3 @@ class RegistersIteratorTestCase(TestBase): # We've finished dumping the registers for frame #0. break - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py index 09945f5cbe54..7319ce39b488 100644 --- a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py +++ b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py @@ -2,9 +2,10 @@ Test SBprocess and SBThread APIs with printing of the stack traces using lldbutil. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * @@ -47,10 +48,3 @@ class ThreadsStackTracesTestCase(TestBase): stacktraces = lldbutil.print_stacktraces(process, string_buffer=True) self.expect(stacktraces, exe=False, substrs = ['(int)argc=3']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/module_section/TestModuleAndSection.py b/lldb/test/python_api/module_section/TestModuleAndSection.py index 78e4b229bf98..d1a69f934d63 100644 --- a/lldb/test/python_api/module_section/TestModuleAndSection.py +++ b/lldb/test/python_api/module_section/TestModuleAndSection.py @@ -2,9 +2,10 @@ Test some SBModule and SBSection APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb from lldbtest import * from lldbutil import symbol_type_to_str @@ -121,9 +122,3 @@ class ModuleAndSectionAPIsTestCase(TestBase): INDENT2 = INDENT * 2 for cu in exe_module.compile_unit_iter(): print cu - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/objc_type/TestObjCType.py b/lldb/test/python_api/objc_type/TestObjCType.py index 9b8e915dd446..ed34d43a2958 100644 --- a/lldb/test/python_api/objc_type/TestObjCType.py +++ b/lldb/test/python_api/objc_type/TestObjCType.py @@ -2,9 +2,10 @@ Test SBType for ObjC classes. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -58,9 +59,3 @@ class ObjCSBTypeTestCase(TestBase): aBarField = aBarType.GetFieldAtIndex(0) self.assertTrue(aBarField.GetName() == "_iVar", "The field has the right name") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py index 0aaeca6299e0..15a70d12a084 100644 --- a/lldb/test/python_api/process/TestProcessAPI.py +++ b/lldb/test/python_api/process/TestProcessAPI.py @@ -2,8 +2,9 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbutil import get_stopped_thread, state_type_to_str from lldbtest import * @@ -283,10 +284,3 @@ class ProcessAPITestCase(TestBase): num = process.GetNumSupportedHardwareWatchpoints(error) if self.TraceOn() and error.Success(): print "Number of supported hardware watchpoints: %d" % num - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/test/python_api/process/io/TestProcessIO.py index 9bd3b82a4f5b..1fce478b4f22 100644 --- a/lldb/test/python_api/process/io/TestProcessIO.py +++ b/lldb/test/python_api/process/io/TestProcessIO.py @@ -1,7 +1,8 @@ """Test Python APIs for process IO.""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -201,9 +202,3 @@ class ProcessIOTestCase(TestBase): for line in self.lines: check_line = 'input line to stderr: %s' % (line) self.assertTrue(check_line in error, "verify stderr line shows up in STDERR") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py index 7f9fb1ca27c8..1880dc25f990 100644 --- a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py +++ b/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py @@ -2,8 +2,9 @@ Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -49,9 +50,3 @@ class Radar12481949DataFormatterTestCase(TestBase): self.assertTrue(self.frame().FindVariable("myvar").GetValueAsUnsigned() != -1, "GetValueAsUnsigned() does not say -1") self.assertTrue(self.frame().FindVariable("myvar").GetValueAsUnsigned() == 0xFFFFFFFFFFFFFFFF, "GetValueAsUnsigned() says 0xFFFFFFFFFFFFFFFF") self.assertTrue(self.frame().FindVariable("myvar").GetValueAsSigned() != 0xFFFFFFFF, "GetValueAsUnsigned() does not say 0xFFFFFFFF") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/sbdata/TestSBData.py b/lldb/test/python_api/sbdata/TestSBData.py index f3fd65b18849..beb9fd57c5c7 100644 --- a/lldb/test/python_api/sbdata/TestSBData.py +++ b/lldb/test/python_api/sbdata/TestSBData.py @@ -1,7 +1,8 @@ """Test the SBData APIs.""" +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * from math import fabs @@ -343,9 +344,3 @@ class SBDataAPICase(TestBase): arg, stream.GetData())) self.assertTrue(expected == result, "%s(error, %s) == %s != %s" % (func.__name__, arg, result, expected)) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py index a5881db1877c..eca6f41a13c0 100644 --- a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py +++ b/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py @@ -1,7 +1,8 @@ """Test SBValue::Persist""" +import lldb_shared + import os, sys, time -import unittest2 import lldb from lldbtest import * import lldbutil @@ -69,9 +70,3 @@ class SBValuePersistTestCase(TestBase): self.assertTrue(bazPersist.GetSummary() == '"85"', "bazPersist != 85") self.expect("expr *(%s)" % (barPersist.GetName()), substrs = ['= 4']) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/section/TestSectionAPI.py b/lldb/test/python_api/section/TestSectionAPI.py index 10870a89f0a3..7a6bc3ac8124 100755 --- a/lldb/test/python_api/section/TestSectionAPI.py +++ b/lldb/test/python_api/section/TestSectionAPI.py @@ -2,7 +2,8 @@ Test SBSection APIs. """ -import unittest2 +import lldb_shared + from lldbtest import * class SectionAPITestCase(TestBase): @@ -36,9 +37,3 @@ class SectionAPITestCase(TestBase): self.assertIsNotNone(data_section) self.assertEquals(data_section.target_byte_size, 1) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/signals/TestSignalsAPI.py b/lldb/test/python_api/signals/TestSignalsAPI.py index f8c3db8e79b7..7bea793c5113 100644 --- a/lldb/test/python_api/signals/TestSignalsAPI.py +++ b/lldb/test/python_api/signals/TestSignalsAPI.py @@ -2,8 +2,9 @@ Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbutil import get_stopped_thread, state_type_to_str from lldbtest import * @@ -42,10 +43,3 @@ class SignalsAPITestCase(TestBase): process.Continue() self.assertTrue(process.state == lldb.eStateExited, "The process should have exited") self.assertTrue(process.GetExitStatus() == 0, "The process should have returned 0") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/symbol-context/TestSymbolContext.py b/lldb/test/python_api/symbol-context/TestSymbolContext.py index a92315e71c3f..5bca394d3b1d 100644 --- a/lldb/test/python_api/symbol-context/TestSymbolContext.py +++ b/lldb/test/python_api/symbol-context/TestSymbolContext.py @@ -2,9 +2,10 @@ Test SBSymbolContext APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -83,10 +84,3 @@ class SymbolContextAPITestCase(TestBase): symbol = context.GetSymbol() self.assertTrue(function.GetName() == symbol.GetName() and symbol.GetName() == 'c', "The symbol name should be 'c'") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/target/TestTargetAPI.py b/lldb/test/python_api/target/TestTargetAPI.py index a9f3590123a2..e61d82d0e04b 100644 --- a/lldb/test/python_api/target/TestTargetAPI.py +++ b/lldb/test/python_api/target/TestTargetAPI.py @@ -2,9 +2,11 @@ Test SBTarget APIs. """ +import lldb_shared + +import unittest2 import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -365,10 +367,3 @@ class TargetAPITestCase(TestBase): desc2 = get_description(symbol2) self.assertTrue(desc1 and desc2 and desc1 == desc2, "The two addresses should resolve to the same symbol") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py index 8ace950a46e0..2fea893a1ebf 100644 --- a/lldb/test/python_api/thread/TestThreadAPI.py +++ b/lldb/test/python_api/thread/TestThreadAPI.py @@ -2,8 +2,9 @@ Test SBThread APIs. """ +import lldb_shared + import os, time -import unittest2 import lldb from lldbutil import get_stopped_thread, get_caller_symbol from lldbtest import * @@ -240,10 +241,3 @@ class ThreadAPITestCase(TestBase): thread.RunToAddress(start_addr) self.runCmd("process status") #self.runCmd("thread backtrace") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/type/TestTypeList.py b/lldb/test/python_api/type/TestTypeList.py index f790f5f6eeeb..4be01a210bff 100644 --- a/lldb/test/python_api/type/TestTypeList.py +++ b/lldb/test/python_api/type/TestTypeList.py @@ -2,9 +2,10 @@ Test SBType and SBTypeList API. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -105,9 +106,3 @@ class TypeAndTypeListTestCase(TestBase): # SBType.GetBasicType() takes an enum 'BasicType' (lldb-enumerations.h). int_type = id_type.GetBasicType(lldb.eBasicTypeInt) self.assertTrue(id_type == int_type) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/value/TestValueAPI.py b/lldb/test/python_api/value/TestValueAPI.py index 3c67d69e225a..e6d8825c530f 100644 --- a/lldb/test/python_api/value/TestValueAPI.py +++ b/lldb/test/python_api/value/TestValueAPI.py @@ -2,9 +2,10 @@ Test some SBValue APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -129,9 +130,3 @@ class ValueAPITestCase(TestBase): val_a = target.EvaluateExpression('a') self.assertTrue(val_s.GetChildMemberWithName('a').AddressOf(), VALID_VARIABLE) self.assertTrue(val_a.Cast(val_i.GetType()).AddressOf(), VALID_VARIABLE) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py index dd30c9d40879..0b326b945e1e 100644 --- a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py +++ b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py @@ -2,9 +2,10 @@ Test some SBValue APIs. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -142,9 +143,3 @@ class ChangeValueAPITestCase(TestBase): self.assertTrue(thread == None, "We should not have managed to hit our second breakpoint with sp == 1") process.Kill() - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py index 2329c96fe610..8270ed8fffe9 100644 --- a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py +++ b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py @@ -3,9 +3,10 @@ Test SBValue API linked_list_iter which treats the SBValue as a linked list and supports iteration till the end of list is reached. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -127,9 +128,3 @@ class ValueAsLinkedListTestCase(TestBase): list.append(int(t.GetChildMemberWithName("id").GetValue())) self.assertTrue(len(list) == 3) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py index 76d4d64b5424..9c0123ec2e11 100644 --- a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py +++ b/lldb/test/python_api/value_var_update/TestValueVarUpdate.py @@ -1,7 +1,8 @@ """Test SBValue::GetValueDidChange""" +import lldb_shared + import os, sys, time -import unittest2 import lldb import time from lldbtest import * @@ -54,9 +55,3 @@ class HelloWorldTestCase(TestBase): # Check complex type self.assertTrue(c.GetChildAtIndex(0).GetChildAtIndex(0).GetValueDidChange() and not c.GetChildAtIndex(1).GetValueDidChange(), "GetValueDidChange() is saying a lie") - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py index 9e464ad363a5..242b199db7de 100644 --- a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py +++ b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py @@ -2,9 +2,10 @@ Use lldb Python SBValue API to create a watchpoint for read_write of 'globl' var. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -87,10 +88,3 @@ class SetWatchpointAPITestCase(TestBase): # At this point, the inferior process should have exited. self.assertTrue(process.GetState() == lldb.eStateExited, PROCESS_EXITED) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py index 6b4197b3d486..f8ae2a23966e 100644 --- a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py +++ b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py @@ -2,9 +2,10 @@ Use lldb Python SBWatchpoint API to set the ignore count. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -83,10 +84,3 @@ class WatchpointIgnoreCountTestCase(TestBase): self.assertTrue(watchpoint.GetWatchSize() == 4) self.assertTrue(watchpoint.GetHitCount() == 2) print watchpoint - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/python_api/watchpoint/TestWatchpointIter.py index 8a6877930eeb..0ba73c0500b1 100644 --- a/lldb/test/python_api/watchpoint/TestWatchpointIter.py +++ b/lldb/test/python_api/watchpoint/TestWatchpointIter.py @@ -2,9 +2,10 @@ Use lldb Python SBTarget API to iterate on the watchpoint(s) for the target. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -108,10 +109,3 @@ class WatchpointIteratorTestCase(TestBase): self.assertTrue(watchpoint.GetWatchSize() == 4) self.assertTrue(watchpoint.GetHitCount() == 1) print watchpoint - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py index 041e185de54d..dd7c79971e89 100644 --- a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py +++ b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py @@ -2,8 +2,9 @@ Test watchpoint condition API. """ +import lldb_shared + import os, time -import unittest2 import lldb import lldbutil from lldbtest import * @@ -84,10 +85,3 @@ class WatchpointConditionAPITestCase(TestBase): # Verify that the condition is met. self.assertTrue(value.GetValueAsUnsigned() == 5) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py index 9830dd197771..51a8955b6894 100644 --- a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py +++ b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py @@ -2,9 +2,10 @@ Use lldb Python SBValue.WatchPointee() API to create a watchpoint for write of '*g_char_ptr'. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -84,10 +85,3 @@ class SetWatchlocationAPITestCase(TestBase): substrs = [self.violating_func]) # This finishes our test. - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py index ebcb6ff12d9c..d6a3ca60c87a 100644 --- a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py +++ b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py @@ -2,9 +2,10 @@ Use lldb Python SBtarget.WatchAddress() API to create a watchpoint for write of '*g_char_ptr'. """ +import lldb_shared + import os, time import re -import unittest2 import lldb, lldbutil from lldbtest import * @@ -124,10 +125,3 @@ class TargetWatchAddressAPITestCase(TestBase): self.assertFalse(watchpoint) self.expect(error.GetCString(), exe=False, substrs = ['watch size of %d is not supported' % 365]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py index 21b8b76ebf7b..a20a90383d2d 100644 --- a/lldb/test/settings/TestSettings.py +++ b/lldb/test/settings/TestSettings.py @@ -2,8 +2,9 @@ Test lldb settings command. """ +import lldb_shared + import os, time, re -import unittest2 import lldb from lldbtest import * @@ -490,11 +491,3 @@ class SettingsCommandTestCase(TestBase): "target.process.extra-startup-command", "target.process.thread.step-avoid-regexp", "target.process.thread.trace-thread"]) - - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/settings/quoting/TestQuoting.py b/lldb/test/settings/quoting/TestQuoting.py index 44fb01ffdef7..7ef861d26395 100644 --- a/lldb/test/settings/quoting/TestQuoting.py +++ b/lldb/test/settings/quoting/TestQuoting.py @@ -2,8 +2,9 @@ Test quoting of arguments to lldb commands """ +import lldb_shared + import os, time, re -import unittest2 import lldb from lldbtest import * @@ -87,9 +88,3 @@ class SettingsCommandTestCase(TestBase): self.RemoveTempFile("stdout.txt") self.assertEqual(output, args_out) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/source-manager/TestSourceManager.py b/lldb/test/source-manager/TestSourceManager.py index c4f7131ec0b6..ea6499ea6696 100644 --- a/lldb/test/source-manager/TestSourceManager.py +++ b/lldb/test/source-manager/TestSourceManager.py @@ -9,7 +9,8 @@ o test_modify_source_file_while_debugging: Test the caching mechanism of the source manager. """ -import unittest2 +import lldb_shared + import lldb from lldbtest import * import lldbutil @@ -168,10 +169,3 @@ class SourceManagerTestCase(TestBase): # Display the source code again. We should see the updated line. self.expect("source list -f main.c -l %d" % self.line, SOURCE_DISPLAYED_CORRECTLY, substrs = ['Hello lldb']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/terminal/TestSTTYBeforeAndAfter.py index d3acccafa3ad..49e91cf42a31 100644 --- a/lldb/test/terminal/TestSTTYBeforeAndAfter.py +++ b/lldb/test/terminal/TestSTTYBeforeAndAfter.py @@ -2,8 +2,9 @@ Test that 'stty -a' displays the same output before and after running the lldb command. """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * @@ -116,10 +117,3 @@ class CommandLineCompletionTestCase(TestBase): if len(tuple[0]) == 0: break self.assertTrue(tuple[0] == tuple[1]) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiExit.py b/lldb/test/tools/lldb-mi/TestMiExit.py index 9c0e1735e8a4..3d0463de86d5 100644 --- a/lldb/test/tools/lldb-mi/TestMiExit.py +++ b/lldb/test/tools/lldb-mi/TestMiExit.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver exits properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiExitTestCase(lldbmi_testcase.MiTestCaseBase): @@ -82,6 +83,3 @@ class MiExitTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("q") import pexpect self.expect(pexpect.EOF) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiFile.py b/lldb/test/tools/lldb-mi/TestMiFile.py index 16add25b95b3..01f9dc643eab 100644 --- a/lldb/test/tools/lldb-mi/TestMiFile.py +++ b/lldb/test/tools/lldb-mi/TestMiFile.py @@ -2,9 +2,10 @@ Test lldb-mi -file-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiFileTestCase(lldbmi_testcase.MiTestCaseBase): @@ -76,6 +77,3 @@ class MiFileTestCase(lldbmi_testcase.MiTestCaseBase): path = "unknown_dir/%s" % self.myexe self.runCmd("-file-exec-and-symbols %s" % path) self.expect("\^error") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py index cedfecea7bc5..45aff71ae52c 100644 --- a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py +++ b/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py @@ -2,9 +2,11 @@ Test lldb-mi -gdb-set and -gdb-show commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): @@ -191,6 +193,3 @@ class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done"); self.runCmd("-var-evaluate-expression var_a"); self.expect("\^done,value=\"10\""); - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py index bc46c716772a..841398618c9e 100644 --- a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py +++ b/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py @@ -2,9 +2,10 @@ Test lldb-mi =library-loaded notifications. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase): @@ -29,6 +30,3 @@ class MiLibraryLoadedTestCase(lldbmi_testcase.MiTestCaseBase): def add_slashes(x): return x.replace("\\", "\\\\").replace("\"", "\\\"").replace("\'", "\\\'").replace("\0", "\\\0") self.expect([ "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"1\",symbols-path=\"%s\",loaded_addr=\"-\",size=\"[0-9]+\"" % (add_slashes(path), add_slashes(path), add_slashes(path), add_slashes(symbols_path)), "=library-loaded,id=\"%s\",target-name=\"%s\",host-name=\"%s\",symbols-loaded=\"0\",loaded_addr=\"-\",size=\"[0-9]+\"" % (add_slashes(path), add_slashes(path), add_slashes(path)) ]) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/TestMiPrompt.py b/lldb/test/tools/lldb-mi/TestMiPrompt.py index 32ae53281e39..6f4bb76ddc7c 100644 --- a/lldb/test/tools/lldb-mi/TestMiPrompt.py +++ b/lldb/test/tools/lldb-mi/TestMiPrompt.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver prints prompt properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase): @@ -50,6 +51,3 @@ class MiPromptTestCase(lldbmi_testcase.MiTestCaseBase): # Test that lldb-mi is ready after program exited self.expect("\*stopped,reason=\"exited-normally\"") self.expect(self.child_prompt, exactly = True) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py index 57a49257fa27..c08e92eba6ac 100644 --- a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py +++ b/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py @@ -2,9 +2,11 @@ Test lldb-mi -break-xxx commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase): @@ -247,6 +249,3 @@ class MiBreakTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("-exec-continue") self.expect("\^running") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/control/TestMiExec.py b/lldb/test/tools/lldb-mi/control/TestMiExec.py index 9e027b23c2fb..a17fd66eb6e5 100644 --- a/lldb/test/tools/lldb-mi/control/TestMiExec.py +++ b/lldb/test/tools/lldb-mi/control/TestMiExec.py @@ -2,9 +2,10 @@ Test lldb-mi -exec-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiExecTestCase(lldbmi_testcase.MiTestCaseBase): @@ -466,6 +467,3 @@ class MiExecTestCase(lldbmi_testcase.MiTestCaseBase): self.runCmd("-exec-finish --thread 1 --frame 0") self.expect("\^running") self.expect("\*stopped,reason=\"end-stepping-range\".+?func=\"main\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/data/TestMiData.py b/lldb/test/tools/lldb-mi/data/TestMiData.py index 9d2cf7e01430..c26c16e0c6e6 100644 --- a/lldb/test/tools/lldb-mi/data/TestMiData.py +++ b/lldb/test/tools/lldb-mi/data/TestMiData.py @@ -2,9 +2,11 @@ Test lldb-mi -data-xxx commands. """ +import lldb_shared + +import unittest2 import lldbmi_testcase from lldbtest import * -import unittest2 class MiDataTestCase(lldbmi_testcase.MiTestCaseBase): @@ -334,6 +336,3 @@ class MiDataTestCase(lldbmi_testcase.MiTestCaseBase): # Check 2d array self.runCmd("-data-evaluate-expression array2d") self.expect("\^done,value=\"\{\[0\] = \{\[0\] = 1, \[1\] = 2, \[2\] = 3\}, \[1\] = \{\[0\] = 4, \[1\] = 5, \[2\] = 6\}\}\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py index 96de44255738..b28c055afbe0 100644 --- a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py +++ b/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py @@ -2,9 +2,10 @@ Test lldb-mi can interpret CLI commands directly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase): @@ -209,6 +210,3 @@ class MiCliSupportTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done") self.expect("@\"argc=1\\\\r\\\\n") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py index ce277a85c444..86eb8ffb3c42 100644 --- a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py +++ b/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py @@ -2,9 +2,10 @@ Test lldb-mi -interpreter-exec command. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase): @@ -231,6 +232,3 @@ class MiInterpreterExecTestCase(lldbmi_testcase.MiTestCaseBase): self.expect("\^done") self.expect("@\"argc=1\\\\r\\\\n") self.expect("\*stopped,reason=\"exited-normally\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/test/tools/lldb-mi/lldbmi_testcase.py index c9ba78203d7a..e29864ac5df5 100644 --- a/lldb/test/tools/lldb-mi/lldbmi_testcase.py +++ b/lldb/test/tools/lldb-mi/lldbmi_testcase.py @@ -2,8 +2,9 @@ Base class for lldb-mi test cases. """ +import lldb_shared + from lldbtest import * -import unittest2 class MiTestCaseBase(Base): diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py index 16532c8d13ee..22f05c319527 100644 --- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py +++ b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py @@ -2,9 +2,10 @@ Test that the lldb-mi handles signals properly. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase): @@ -197,6 +198,3 @@ class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase): # Exit self.runCmd("-gdb-exit") self.expect("\^exit") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/test/tools/lldb-mi/stack/TestMiStack.py index 1410c25f7096..f4ebf30141e7 100644 --- a/lldb/test/tools/lldb-mi/stack/TestMiStack.py +++ b/lldb/test/tools/lldb-mi/stack/TestMiStack.py @@ -2,9 +2,10 @@ Test lldb-mi -stack-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiStackTestCase(lldbmi_testcase.MiTestCaseBase): @@ -481,6 +482,3 @@ class MiStackTestCase(lldbmi_testcase.MiTestCaseBase): # Test that current frame is #0 and it has the same information self.runCmd("-stack-info-frame") self.expect("\^done,frame=\{level=\"0\",addr=\"0x[0-9a-f]+\",func=\"main\",file=\"main\.cpp\",fullname=\".+?main\.cpp\",line=\"\d+\"\}") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py index fc732bd19409..8f3411973877 100644 --- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py +++ b/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py @@ -2,9 +2,10 @@ Test lldb-mi startup options. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase): @@ -295,6 +296,3 @@ class MiStartupOptionsTestCase(lldbmi_testcase.MiTestCaseBase): # Delete log for f in logFile: os.remove(f) - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py index 6bfba63ca020..aec5ef13860d 100644 --- a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py +++ b/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py @@ -2,9 +2,10 @@ Test lldb-mi -symbol-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase): @@ -69,6 +70,3 @@ class MiSymbolTestCase(lldbmi_testcase.MiTestCaseBase): # Test that -symbol-list-lines fails when file doesn't exist self.runCmd("-symbol-list-lines unknown_dir/main.cpp") self.expect("\^error,message=\"warning: No source filenames matched 'unknown_dir/main\.cpp'\. error: no source filenames matched any command arguments \"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py index ffcf3fe05e20..96ff1076c2fd 100644 --- a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py +++ b/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py @@ -2,9 +2,10 @@ Test that the lldb-mi driver understands MI command syntax. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase): @@ -78,6 +79,3 @@ class MiSyntaxTestCase(lldbmi_testcase.MiTestCaseBase): # Test that a process output is wrapped correctly self.expect("\@\"'\\\\r\\\\n\"") self.expect("\@\"` - it's \\\\\\\\n\\\\x12\\\\\"\\\\\\\\\\\\\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/test/tools/lldb-mi/target/TestMiTarget.py index a6bff66ddaa5..0166c8d674ae 100644 --- a/lldb/test/tools/lldb-mi/target/TestMiTarget.py +++ b/lldb/test/tools/lldb-mi/target/TestMiTarget.py @@ -2,9 +2,10 @@ Test lldb-mi -target-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiTargetTestCase(lldbmi_testcase.MiTestCaseBase): diff --git a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py index 93f6ed009ef3..177ddae8c73b 100644 --- a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py +++ b/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py @@ -3,9 +3,10 @@ Test lldb-mi -gdb-set and -gdb-show commands for 'print option-name'. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): @@ -225,6 +226,3 @@ class MiGdbSetShowTestCase(lldbmi_testcase.MiTestCaseBase): # Test that -gdb-set print aggregate-field-names fails when option is unknown self.runCmd("-gdb-set print aggregate-field-names unknown") self.expect("\^error,msg=\"The request ''print' expects option-name and \"on\" or \"off\"' failed.\"") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/test/tools/lldb-mi/variable/TestMiVar.py index 8d464fc44133..d1d3bdc9a77f 100644 --- a/lldb/test/tools/lldb-mi/variable/TestMiVar.py +++ b/lldb/test/tools/lldb-mi/variable/TestMiVar.py @@ -2,9 +2,10 @@ Test lldb-mi -var-xxx commands. """ +import lldb_shared + import lldbmi_testcase from lldbtest import * -import unittest2 class MiVarTestCase(lldbmi_testcase.MiTestCaseBase): @@ -353,6 +354,3 @@ class MiVarTestCase(lldbmi_testcase.MiTestCaseBase): # Test for std::string self.runCmd("-var-create - * std_string") self.expect('\^done,name="var\d+",numchild="[0-9]+",value="\\\\"hello\\\\"",type="std::[\S]*?string",thread-id="1",has_more="0"') - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py index 33baaa559abd..33a6832981ee 100644 --- a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py +++ b/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py @@ -2,8 +2,9 @@ Tests the binary ($x) and hex ($m) memory read packets of the remote stub """ +import lldb_shared + import os -import unittest2 import lldb from lldbtest import * import lldbutil @@ -36,10 +37,3 @@ class MemoryReadTestCase(TestBase): process.Continue() self.assertEqual(process.GetState(), lldb.eStateExited, "Process exited") - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py index dab3ff44ca3a..797814b704af 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py @@ -1,6 +1,7 @@ +import lldb_shared + import gdbremote_testcase import lldbgdbserverutils -import unittest2 from lldbtest import * @@ -55,7 +56,3 @@ class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_attach_manually() self.attach_with_vAttach() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py index 0a185b589230..782a3d700f0c 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -197,7 +197,3 @@ class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.auxv_chunked_reads_work() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py index 06b103d8e2da..9218dbfb1343 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -140,7 +140,3 @@ class TestGdbRemoteExpeditedRegisters(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.stop_notification_contains_sp_register() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py index 459879e700c3..f4de5a0c9c83 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import lldbgdbserverutils diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py index 4aa9218de366..3ef299eac990 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py @@ -1,7 +1,8 @@ +import lldb_shared + import gdbremote_testcase import lldbgdbserverutils import sys -import unittest2 from lldbtest import * @@ -174,7 +175,3 @@ class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase): self.init_llgs_test() self.build() self.qProcessInfo_does_not_contain_keys(set(['cputype', 'cpusubtype'])) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py index a6d62221fba3..f2d44cad93f9 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -122,7 +122,3 @@ class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.grp_register_save_restore_works(USE_THREAD_SUFFIX) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py index 53aa4b5392f1..98ea7df55e88 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -21,6 +21,3 @@ class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.single_step_only_steps_one_instruction(use_Hc_packet=True, step_instruction="s") - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py index 7e3f4ddd0415..ab4f45718290 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py +++ b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -160,7 +160,3 @@ class TestGdbRemoteThreadsInStopReply(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.stop_reply_reports_correct_threads(5) - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py index 915b1a1aef9d..d8abdfc4f1a4 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py +++ b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py @@ -1,6 +1,8 @@ -import sys -import unittest2 +import lldb_shared +import sys + +import unittest2 import gdbremote_testcase from lldbtest import * @@ -144,7 +146,3 @@ class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.qThreadStopInfo_has_valid_thread_names(self.THREAD_COUNT, "a.out") - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py index 8716ee16c5f0..370d94593068 100644 --- a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py +++ b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase from lldbtest import * @@ -112,7 +112,3 @@ class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.single_step_only_steps_one_instruction(use_Hc_packet=False, step_instruction="vCont;s:{thread}") - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py index bbe8e776ca11..9d8f418b906b 100644 --- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py +++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py @@ -10,11 +10,13 @@ gdb remote packet functional areas. For now it contains the initial set of tests implemented. """ +import lldb_shared + +import unittest2 import gdbremote_testcase import lldbgdbserverutils import platform import signal -import unittest2 from lldbtest import * class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): @@ -1465,7 +1467,3 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase): self.build() self.set_inferior_startup_launch() self.P_and_p_thread_suffix_work() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py index 6e793b9a9f90..34850c74868b 100644 --- a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py +++ b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py @@ -83,7 +83,3 @@ class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase): self.init_llgs_test(use_named_pipe=False) self.set_inferior_startup_launch() self.reverse_connect_works() - - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py index 32e4818176da..401206bca022 100644 --- a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py +++ b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import lldbgdbserverutils diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py index 159a5172cf9e..91f36c0111a9 100644 --- a/lldb/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py @@ -2,6 +2,8 @@ Base class for gdb-remote test cases. """ +import lldb_shared + import errno import os import os.path @@ -16,7 +18,6 @@ import subprocess import sys import tempfile import time -import unittest2 from lldbtest import * from lldbgdbserverutils import * import logging diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py index 2948aff2a7e7..e07fe8bc0966 100644 --- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py +++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import signal diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py index 322f41cd336d..0c0bef457ded 100644 --- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py +++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py @@ -1,4 +1,4 @@ -import unittest2 +import lldb_shared import gdbremote_testcase import signal diff --git a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py index 034714e586cb..f5b4ba35a9a0 100644 --- a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py +++ b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py @@ -1,9 +1,10 @@ +import lldb_shared + +import unittest2 import os.path import re import sys -import unittest2 - from lldbgdbserverutils import * @@ -44,6 +45,3 @@ class TestLldbGdbServerUtils(unittest2.TestCase): except AssertionError: # okay return None - -if __name__ == '__main__': - unittest2.main() diff --git a/lldb/test/types/HideTestFailures.py b/lldb/test/types/HideTestFailures.py index 38adfc5b3499..1c2e6ca8108b 100644 --- a/lldb/test/types/HideTestFailures.py +++ b/lldb/test/types/HideTestFailures.py @@ -2,8 +2,9 @@ Test that variables of integer basic types are displayed correctly. """ +import lldb_shared + import AbstractBase -import unittest2 import sys import lldb from lldbtest import * @@ -73,9 +74,3 @@ class DebugIntegerTypesFailures(TestBase): self.build(dictionary=d) self.setTearDownCleanup(dictionary=d) self.generic_type_tester(set(['long long'])) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/types/TestFloatTypes.py b/lldb/test/types/TestFloatTypes.py index ee2239b13a9a..fcac507701d9 100644 --- a/lldb/test/types/TestFloatTypes.py +++ b/lldb/test/types/TestFloatTypes.py @@ -2,8 +2,9 @@ Test that variables of floating point types are displayed correctly. """ +import lldb_shared + import AbstractBase -import unittest2 import lldb import sys from lldbtest import * @@ -36,9 +37,3 @@ class FloatTypesTestCase(AbstractBase.GenericTester): def test_double_type_from_block(self): """Test that double-type variables are displayed correctly from a block.""" self.build_and_run('double.cpp', set(['double']), bc=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/types/TestFloatTypesExpr.py b/lldb/test/types/TestFloatTypesExpr.py index 27ae16ef9e3e..52ba347c0756 100644 --- a/lldb/test/types/TestFloatTypesExpr.py +++ b/lldb/test/types/TestFloatTypesExpr.py @@ -2,8 +2,9 @@ Test that variable expressions of floating point types are evaluated correctly. """ +import lldb_shared + import AbstractBase -import unittest2 import lldb import sys from lldbtest import * @@ -39,9 +40,3 @@ class FloatTypesExprTestCase(AbstractBase.GenericTester): def test_double_type_from_block(self): """Test that double-type variables are displayed correctly from a block.""" self.build_and_run_expr('double.cpp', set(['double']), bc=True) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/types/TestIntegerTypes.py b/lldb/test/types/TestIntegerTypes.py index 69b1af5a8e33..d592f39d0e0c 100644 --- a/lldb/test/types/TestIntegerTypes.py +++ b/lldb/test/types/TestIntegerTypes.py @@ -2,8 +2,9 @@ Test that variables of integer basic types are displayed correctly. """ +import lldb_shared + import AbstractBase -import unittest2 import lldb import sys from lldbtest import * @@ -108,10 +109,3 @@ class IntegerTypesTestCase(AbstractBase.GenericTester): def test_unsigned_long_long_type_from_block(self): """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" self.build_and_run('unsigned_long_long.cpp', set(['unsigned', 'long long']), bc=True) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/types/TestIntegerTypesExpr.py b/lldb/test/types/TestIntegerTypesExpr.py index 3162c4161380..a252ca816ffa 100644 --- a/lldb/test/types/TestIntegerTypesExpr.py +++ b/lldb/test/types/TestIntegerTypesExpr.py @@ -2,8 +2,9 @@ Test that variable expressions of integer basic types are evaluated correctly. """ +import lldb_shared + import AbstractBase -import unittest2 import lldb import sys from lldbtest import * @@ -108,10 +109,3 @@ class IntegerTypesExprTestCase(AbstractBase.GenericTester): def test_unsigned_long_long_type_from_block(self): """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" self.build_and_run_expr('unsigned_long_long.cpp', set(['unsigned', 'long long']), bc=True) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/types/TestRecursiveTypes.py b/lldb/test/types/TestRecursiveTypes.py index 5ded66d80c25..f115c9bcc425 100644 --- a/lldb/test/types/TestRecursiveTypes.py +++ b/lldb/test/types/TestRecursiveTypes.py @@ -2,10 +2,11 @@ Test that recursive types are handled correctly. """ +import lldb_shared + import lldb import lldbutil import sys -import unittest2 from lldbtest import * class RecursiveTypesTestCase(TestBase): @@ -46,9 +47,3 @@ class RecursiveTypesTestCase(TestBase): self.expect("print tpi", RUN_SUCCEEDED) self.expect("print *tpi", RUN_SUCCEEDED) - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main() diff --git a/lldb/test/warnings/uuid/TestAddDsymCommand.py b/lldb/test/warnings/uuid/TestAddDsymCommand.py index 774e7725bafe..7ea233ac924a 100644 --- a/lldb/test/warnings/uuid/TestAddDsymCommand.py +++ b/lldb/test/warnings/uuid/TestAddDsymCommand.py @@ -1,7 +1,8 @@ """Test that the 'add-dsym', aka 'target symbols add', command informs the user about success or failure.""" +import lldb_shared + import os, time -import unittest2 import lldb from lldbtest import * @@ -102,10 +103,3 @@ class AddDsymCommandCase(TestBase): right_path = "%s.dSYM" % exe_name self.expect("add-dsym " + right_path, substrs = ['symbol file', 'has been added to']) - - -if __name__ == '__main__': - import atexit - lldb.SBDebugger.Initialize() - atexit.register(lambda: lldb.SBDebugger.Terminate()) - unittest2.main()