[Lldb-commits] [lldb] 4cc8f2a - [lldb][tests] Automatically call compute_mydir (NFC)

Dave Lee via lldb-commits lldb-commits at lists.llvm.org
Fri Jun 17 14:35:03 PDT 2022


Author: Dave Lee
Date: 2022-06-17T14:34:49-07:00
New Revision: 4cc8f2a017c76af25234afc7c380550e9c93135c

URL: https://github.com/llvm/llvm-project/commit/4cc8f2a017c76af25234afc7c380550e9c93135c
DIFF: https://github.com/llvm/llvm-project/commit/4cc8f2a017c76af25234afc7c380550e9c93135c.diff

LOG: [lldb][tests] Automatically call compute_mydir (NFC)

Eliminate boilerplate of having each test manually assign to `mydir` by calling
`compute_mydir` in lldbtest.py.

Differential Revision: https://reviews.llvm.org/D128077

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/README-TestSuite
    lldb/packages/Python/lldbsuite/test/lldbtest.py
    lldb/test/API/android/platform/TestDefaultCacheLineSize.py
    lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
    lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
    lldb/test/API/api/listeners/TestListener.py
    lldb/test/API/api/log/TestAPILog.py
    lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
    lldb/test/API/api/multiple-targets/TestMultipleTargets.py
    lldb/test/API/api/multithreaded/TestMultithreaded.py
    lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py
    lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py
    lldb/test/API/arm/emulation/TestEmulations.py
    lldb/test/API/assert_messages_test/TestAssertMessages.py
    lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
    lldb/test/API/benchmarks/expression/TestExpressionCmd.py
    lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
    lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
    lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
    lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
    lldb/test/API/benchmarks/startup/TestStartupDelays.py
    lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
    lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
    lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py
    lldb/test/API/commands/apropos/basic/TestApropos.py
    lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
    lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py
    lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
    lldb/test/API/commands/command/container/TestContainerCommands.py
    lldb/test/API/commands/command/delete/TestCommandDelete.py
    lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py
    lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
    lldb/test/API/commands/command/regex/TestRegexCommand.py
    lldb/test/API/commands/command/script/TestCommandScript.py
    lldb/test/API/commands/command/script/import/TestImport.py
    lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py
    lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py
    lldb/test/API/commands/command/source/TestCommandSource.py
    lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py
    lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py
    lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
    lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
    lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py
    lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py
    lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
    lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
    lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
    lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py
    lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
    lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
    lldb/test/API/commands/expression/char/TestExprsChar.py
    lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
    lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
    lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py
    lldb/test/API/commands/expression/completion/TestExprCompletion.py
    lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py
    lldb/test/API/commands/expression/context-object/TestContextObject.py
    lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
    lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
    lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py
    lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py
    lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py
    lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
    lldb/test/API/commands/expression/fixits/TestFixIts.py
    lldb/test/API/commands/expression/formatters/TestFormatters.py
    lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
    lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
    lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
    lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
    lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
    lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
    lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
    lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
    lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
    lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
    lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
    lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
    lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
    lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
    lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py
    lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
    lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py
    lldb/test/API/commands/expression/issue_11588/Test11588.py
    lldb/test/API/commands/expression/macros/TestMacros.py
    lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py
    lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py
    lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
    lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
    lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
    lldb/test/API/commands/expression/options/TestExprOptions.py
    lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
    lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
    lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
    lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
    lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
    lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py
    lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
    lldb/test/API/commands/expression/pr52257/TestExprCrash.py
    lldb/test/API/commands/expression/radar_8638051/Test8638051.py
    lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
    lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
    lldb/test/API/commands/expression/result_numbering/TestResultNumbering.py
    lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
    lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py
    lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
    lldb/test/API/commands/expression/test/TestExprs.py
    lldb/test/API/commands/expression/test/TestExprs2.py
    lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py
    lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
    lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
    lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
    lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py
    lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py
    lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
    lldb/test/API/commands/frame/diagnose/array/TestArray.py
    lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py
    lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
    lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
    lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
    lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
    lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
    lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py
    lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
    lldb/test/API/commands/frame/language/TestGuessLanguage.py
    lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py
    lldb/test/API/commands/frame/select/TestFrameSelect.py
    lldb/test/API/commands/frame/var/TestFrameVar.py
    lldb/test/API/commands/gui/basic/TestGuiBasic.py
    lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
    lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
    lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
    lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py
    lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
    lldb/test/API/commands/help/TestHelp.py
    lldb/test/API/commands/log/basic/TestLogging.py
    lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py
    lldb/test/API/commands/memory/read/TestMemoryRead.py
    lldb/test/API/commands/memory/write/TestMemoryWrite.py
    lldb/test/API/commands/platform/basic/TestPlatformCommand.py
    lldb/test/API/commands/platform/basic/TestPlatformPython.py
    lldb/test/API/commands/platform/connect/TestPlatformConnect.py
    lldb/test/API/commands/platform/file/close/TestPlatformFileClose.py
    lldb/test/API/commands/platform/file/read/TestPlatformFileRead.py
    lldb/test/API/commands/platform/process/list/TestProcessList.py
    lldb/test/API/commands/platform/sdk/TestPlatformSDK.py
    lldb/test/API/commands/process/attach-resume/TestAttachResume.py
    lldb/test/API/commands/process/attach/TestProcessAttach.py
    lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py
    lldb/test/API/commands/process/handle/TestProcessHandle.py
    lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
    lldb/test/API/commands/process/launch/TestProcessLaunch.py
    lldb/test/API/commands/process/signal/TestProcessSignal.py
    lldb/test/API/commands/quit/TestQuit.py
    lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
    lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
    lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
    lldb/test/API/commands/register/register/register_command/TestRegisters.py
    lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
    lldb/test/API/commands/session/history/TestSessionHistory.py
    lldb/test/API/commands/session/save/TestSessionSave.py
    lldb/test/API/commands/settings/TestSettings.py
    lldb/test/API/commands/settings/quoting/TestQuoting.py
    lldb/test/API/commands/settings/use_source_cache/TestUseSourceCache.py
    lldb/test/API/commands/statistics/basic/TestStats.py
    lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
    lldb/test/API/commands/target/basic/TestTargetCommand.py
    lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py
    lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py
    lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py
    lldb/test/API/commands/target/dump/TestTargetDumpTypeSystem.py
    lldb/test/API/commands/target/modules/search-paths/insert/TestTargetModulesSearchpathsInsert.py
    lldb/test/API/commands/target/select/TestTargetSelect.py
    lldb/test/API/commands/target/stop-hook/delete/TestTargetStopHookDelete.py
    lldb/test/API/commands/target/stop-hook/disable/TestTargetStopHookDisable.py
    lldb/test/API/commands/target/stop-hook/enable/TestTargetStopHookEnable.py
    lldb/test/API/commands/target/stop-hooks/TestStopHookScripted.py
    lldb/test/API/commands/target/stop-hooks/TestStopHooks.py
    lldb/test/API/commands/thread/backtrace/TestThreadBacktraceRepeat.py
    lldb/test/API/commands/thread/select/TestThreadSelect.py
    lldb/test/API/commands/trace/TestTraceDumpInfo.py
    lldb/test/API/commands/trace/TestTraceDumpInstructions.py
    lldb/test/API/commands/trace/TestTraceEvents.py
    lldb/test/API/commands/trace/TestTraceExport.py
    lldb/test/API/commands/trace/TestTraceLoad.py
    lldb/test/API/commands/trace/TestTraceSave.py
    lldb/test/API/commands/trace/TestTraceSchema.py
    lldb/test/API/commands/trace/TestTraceStartStop.py
    lldb/test/API/commands/trace/TestTraceTSC.py
    lldb/test/API/commands/trace/multiple-threads/TestTraceStartStopMultipleThreads.py
    lldb/test/API/commands/version/TestVersion.py
    lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
    lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
    lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
    lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py
    lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
    lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
    lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
    lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py
    lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
    lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
    lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
    lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
    lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py
    lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
    lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
    lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
    lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
    lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
    lldb/test/API/driver/batch_mode/TestBatchMode.py
    lldb/test/API/driver/job_control/TestJobControl.py
    lldb/test/API/functionalities/abbreviation/TestAbbreviations.py
    lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py
    lldb/test/API/functionalities/archives/TestBSDArchives.py
    lldb/test/API/functionalities/asan/TestMemoryHistory.py
    lldb/test/API/functionalities/asan/TestReportData.py
    lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py
    lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py
    lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
    lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
    lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
    lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/TestBreakInLoadedDylib.py
    lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
    lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
    lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py
    lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
    lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
    lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
    lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
    lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
    lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
    lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
    lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
    lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
    lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
    lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
    lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
    lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
    lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
    lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
    lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
    lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
    lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
    lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py
    lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
    lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
    lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
    lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py
    lldb/test/API/functionalities/breakpoint/hardware_breakpoints/write_memory_with_hw_breakpoint/TestWriteMemoryWithHWBreakpoint.py
    lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
    lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
    lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py
    lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
    lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
    lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
    lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
    lldb/test/API/functionalities/completion/TestCompletion.py
    lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
    lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py
    lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
    lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py
    lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py
    lldb/test/API/functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py
    lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
    lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
    lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
    lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
    lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
    lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
    lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
    lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py
    lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
    lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
    lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
    lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
    lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
    lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
    lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
    lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
    lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
    lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
    lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
    lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
    lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
    lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
    lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
    lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
    lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
    lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
    lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
    lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
    lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
    lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
    lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py
    lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
    lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
    lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
    lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
    lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py
    lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
    lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
    lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
    lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
    lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
    lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
    lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py
    lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py
    lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
    lldb/test/API/functionalities/dlopen_other_executable/TestDlopenOtherExecutable.py
    lldb/test/API/functionalities/dyld-exec-linux/TestDyldExecLinux.py
    lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py
    lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
    lldb/test/API/functionalities/exec/TestExec.py
    lldb/test/API/functionalities/fat_archives/TestFatArchives.py
    lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
    lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
    lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
    lldb/test/API/functionalities/gdb_remote_client/TestFork.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
    lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
    lldb/test/API/functionalities/gdb_remote_client/TestGdbClientModuleLoad.py
    lldb/test/API/functionalities/gdb_remote_client/TestIOSSimulator.py
    lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
    lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
    lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
    lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
    lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
    lldb/test/API/functionalities/gdb_remote_client/TestNoLocalFile.py
    lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
    lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
    lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py
    lldb/test/API/functionalities/gdb_remote_client/TestPlatformKill.py
    lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
    lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py
    lldb/test/API/functionalities/gdb_remote_client/TestPty.py
    lldb/test/API/functionalities/gdb_remote_client/TestQemuAArch64TargetXml.py
    lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py
    lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
    lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
    lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
    lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py
    lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
    lldb/test/API/functionalities/gdb_remote_client/TestThreadInfoTrailingComma.py
    lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py
    lldb/test/API/functionalities/gdb_remote_client/TestWasm.py
    lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py
    lldb/test/API/functionalities/gdb_remote_client/TestqOffsets.py
    lldb/test/API/functionalities/history/TestHistoryRecall.py
    lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
    lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py
    lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
    lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
    lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
    lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
    lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
    lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
    lldb/test/API/functionalities/launch_stop_at_entry/TestStopAtEntry.py
    lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py
    lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py
    lldb/test/API/functionalities/load_after_attach/TestLoadAfterAttach.py
    lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
    lldb/test/API/functionalities/load_unload/TestLoadUnload.py
    lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py
    lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
    lldb/test/API/functionalities/longjmp/TestLongjmp.py
    lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
    lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
    lldb/test/API/functionalities/memory/find/TestMemoryFind.py
    lldb/test/API/functionalities/memory/tag/TestMemoryTag.py
    lldb/test/API/functionalities/module_cache/bsd/TestModuleCacheBSD.py
    lldb/test/API/functionalities/module_cache/debug_index/TestDebugIndexCache.py
    lldb/test/API/functionalities/module_cache/simple_exe/TestModuleCacheSimple.py
    lldb/test/API/functionalities/module_cache/universal/TestModuleCacheUniversal.py
    lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py
    lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
    lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py
    lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
    lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py
    lldb/test/API/functionalities/paths/TestPaths.py
    lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
    lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
    lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
    lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
    lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelLive.py
    lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelVMCore.py
    lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
    lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py
    lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py
    lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py
    lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
    lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
    lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py
    lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
    lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py
    lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py
    lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
    lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py
    lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
    lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
    lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
    lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
    lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py
    lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
    lldb/test/API/functionalities/reproducers/attach/TestReproducerAttach.py
    lldb/test/API/functionalities/reproducers/fs-case-sensitivity/TestReproducerFSCaseSensitivity.py
    lldb/test/API/functionalities/rerun/TestRerun.py
    lldb/test/API/functionalities/return-value/TestReturnValue.py
    lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
    lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
    lldb/test/API/functionalities/set-data/TestSetData.py
    lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py
    lldb/test/API/functionalities/signal/TestSendSignal.py
    lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py
    lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py
    lldb/test/API/functionalities/signal/raise/TestRaise.py
    lldb/test/API/functionalities/source-map/TestTargetSourceMap.py
    lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py
    lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
    lldb/test/API/functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py
    lldb/test/API/functionalities/step_scripted/TestStepScripted.py
    lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
    lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py
    lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py
    lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py
    lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py
    lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
    lldb/test/API/functionalities/target_var/TestTargetVar.py
    lldb/test/API/functionalities/target_var/no_vars/TestTargetVarNoVars.py
    lldb/test/API/functionalities/testid/TestTestId.py
    lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py
    lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py
    lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py
    lldb/test/API/functionalities/thread/concurrent_events/exit/TestConcurrentThreadExit.py
    lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
    lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
    lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py
    lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
    lldb/test/API/functionalities/thread/exit_during_expression/TestExitDuringExpression.py
    lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py
    lldb/test/API/functionalities/thread/ignore_suspended/TestIgnoreSuspendedThread.py
    lldb/test/API/functionalities/thread/jump/TestThreadJump.py
    lldb/test/API/functionalities/thread/main_thread_exit/TestMainThreadExit.py
    lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py
    lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py
    lldb/test/API/functionalities/thread/state/TestThreadStates.py
    lldb/test/API/functionalities/thread/state_after_expression/TestStateAfterExpression.py
    lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
    lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
    lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py
    lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
    lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py
    lldb/test/API/functionalities/thread_plan/TestThreadPlanCommands.py
    lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py
    lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py
    lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py
    lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py
    lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py
    lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py
    lldb/test/API/functionalities/tty/TestTerminal.py
    lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
    lldb/test/API/functionalities/type_lookup/TestTypeLookup.py
    lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
    lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py
    lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
    lldb/test/API/functionalities/unwind/aarch64_unwind_pac/TestAArch64UnwindPAC.py
    lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py
    lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
    lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py
    lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
    lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
    lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py
    lldb/test/API/functionalities/var_path/TestVarPath.py
    lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py
    lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py
    lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py
    lldb/test/API/iohandler/resize/TestIOHandlerResize.py
    lldb/test/API/iohandler/resize/TestIOHandlerResizeNoEditline.py
    lldb/test/API/iohandler/sigint/TestIOHandlerPythonREPLSigint.py
    lldb/test/API/iohandler/sigint/TestProcessIOHandlerInterrupt.py
    lldb/test/API/iohandler/stdio/TestIOHandlerProcessSTDIO.py
    lldb/test/API/iohandler/unicode/TestUnicode.py
    lldb/test/API/lang/c/anonymous/TestAnonymous.py
    lldb/test/API/lang/c/array_types/TestArrayTypes.py
    lldb/test/API/lang/c/bitfields/TestBitfields.py
    lldb/test/API/lang/c/blocks/TestBlocks.py
    lldb/test/API/lang/c/builtin-types/TestCBuiltinTypes.py
    lldb/test/API/lang/c/calling-conventions/TestCCallingConventions.py
    lldb/test/API/lang/c/complex/TestComplexC99.py
    lldb/test/API/lang/c/complex_int/TestComplexInt.py
    lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
    lldb/test/API/lang/c/const_variables/TestConstVariables.py
    lldb/test/API/lang/c/cpp_keyword_identifiers/TestCppKeywordsAsCIdentifiers.py
    lldb/test/API/lang/c/enum_types/TestEnumTypes.py
    lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py
    lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py
    lldb/test/API/lang/c/forward/TestForwardDeclaration.py
    lldb/test/API/lang/c/function_types/TestFunctionTypes.py
    lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
    lldb/test/API/lang/c/local_types/TestUseClosestType.py
    lldb/test/API/lang/c/local_variables/TestLocalVariables.py
    lldb/test/API/lang/c/modules/TestCModules.py
    lldb/test/API/lang/c/record_decl_in_expr/TestRecordDeclInExpr.py
    lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
    lldb/test/API/lang/c/set_values/TestSetValues.py
    lldb/test/API/lang/c/shared_lib/TestSharedLib.py
    lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
    lldb/test/API/lang/c/sizeof/TestCSizeof.py
    lldb/test/API/lang/c/step-target/TestStepTarget.py
    lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
    lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py
    lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
    lldb/test/API/lang/c/stepping/TestThreadStepping.py
    lldb/test/API/lang/c/strings/TestCStrings.py
    lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py
    lldb/test/API/lang/c/typedef/Testtypedef.py
    lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
    lldb/test/API/lang/c/unions/TestUnionMembers.py
    lldb/test/API/lang/c/vla/TestVLA.py
    lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py
    lldb/test/API/lang/cpp/alignas_base_class/TestAlignAsBaseClass.py
    lldb/test/API/lang/cpp/auto/TestCPPAuto.py
    lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
    lldb/test/API/lang/cpp/bool/TestCPPBool.py
    lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
    lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
    lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
    lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
    lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
    lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
    lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
    lldb/test/API/lang/cpp/class-loading-via-member-typedef/TestClassLoadingViaMemberTypedef.py
    lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py
    lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
    lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py
    lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
    lldb/test/API/lang/cpp/class_types/TestClassTypes.py
    lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
    lldb/test/API/lang/cpp/complete-type-check/TestCppIsTypeComplete.py
    lldb/test/API/lang/cpp/const_this/TestConstThis.py
    lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
    lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py
    lldb/test/API/lang/cpp/crtp/TestCppCRTP.py
    lldb/test/API/lang/cpp/default-template-args/TestDefaultTemplateArgs.py
    lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
    lldb/test/API/lang/cpp/diamond/TestCppDiamond.py
    lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
    lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
    lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py
    lldb/test/API/lang/cpp/elaborated-types/TestElaboratedTypes.py
    lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
    lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
    lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
    lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
    lldb/test/API/lang/cpp/function-local-class/TestCppFunctionLocalClass.py
    lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
    lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
    lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
    lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py
    lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
    lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
    lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
    lldb/test/API/lang/cpp/inlines/TestInlines.py
    lldb/test/API/lang/cpp/keywords_enabled/TestCppKeywordsEnabled.py
    lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
    lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
    lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py
    lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
    lldb/test/API/lang/cpp/namespace/TestNamespace.py
    lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
    lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
    lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
    lldb/test/API/lang/cpp/non-type-template-param/TestCppNonTypeTemplateParam.py
    lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
    lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
    lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
    lldb/test/API/lang/cpp/pointer_to_member_type_depending_on_parent_size/TestPointerToMemberTypeDependingOnParentSize.py
    lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
    lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
    lldb/test/API/lang/cpp/scope/TestCppScope.py
    lldb/test/API/lang/cpp/scratch-context-merging/structs/TestCppScratchContextMergingStructs.py
    lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
    lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
    lldb/test/API/lang/cpp/static_member_type_depending_on_parent_size/TestStaticMemberTypeDependingOnParentSize.py
    lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
    lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
    lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
    lldb/test/API/lang/cpp/stl/TestSTL.py
    lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
    lldb/test/API/lang/cpp/struct_with_keyword_name/TestStructWithKeywordName.py
    lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
    lldb/test/API/lang/cpp/subst_template_type_param/TestSubstTemplateTypeParam.py
    lldb/test/API/lang/cpp/template-arguments/TestCppTemplateArguments.py
    lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
    lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
    lldb/test/API/lang/cpp/template/TestTemplateArgs.py
    lldb/test/API/lang/cpp/this/TestCPPThis.py
    lldb/test/API/lang/cpp/this_class_type_mixing/TestThisClassTypeMixing.py
    lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py
    lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py
    lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
    lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
    lldb/test/API/lang/cpp/typeof/TestTypeOfDeclTypeExpr.py
    lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
    lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
    lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
    lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
    lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
    lldb/test/API/lang/mixed/TestMixedLanguages.py
    lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py
    lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py
    lldb/test/API/lang/objc/complete-type-check/TestObjCIsTypeComplete.py
    lldb/test/API/lang/objc/conflicting-class-list-function-from-user/TestObjCClassListFunctionFromUser.py
    lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
    lldb/test/API/lang/objc/cpp_keyword_identifiers/TestCppKeywordsAsObjCIdentifiers.py
    lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
    lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
    lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
    lldb/test/API/lang/objc/foundation/TestConstStrings.py
    lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py
    lldb/test/API/lang/objc/foundation/TestObjCMethods.py
    lldb/test/API/lang/objc/foundation/TestObjCMethods2.py
    lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py
    lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py
    lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py
    lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
    lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py
    lldb/test/API/lang/objc/foundation/TestSymbolTable.py
    lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py
    lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
    lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py
    lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
    lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
    lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py
    lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py
    lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
    lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
    lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
    lldb/test/API/lang/objc/modules-non-objc-target/TestObjCModulesNonObjCTarget.py
    lldb/test/API/lang/objc/modules-objc-property/TestModulesObjCProperty.py
    lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
    lldb/test/API/lang/objc/modules/TestObjCModules.py
    lldb/test/API/lang/objc/objc++/TestObjCXX.py
    lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
    lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py
    lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
    lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
    lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
    lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
    lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
    lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
    lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py
    lldb/test/API/lang/objc/objc-property/TestObjCProperty.py
    lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
    lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py
    lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
    lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
    lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py
    lldb/test/API/lang/objc/objc-super/TestObjCSuper.py
    lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
    lldb/test/API/lang/objc/print-obj/TestPrintObj.py
    lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py
    lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
    lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py
    lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py
    lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py
    lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
    lldb/test/API/lang/objc/self/TestObjCSelf.py
    lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
    lldb/test/API/lang/objc/tagged-pointer/TestTaggedPointerCmd.py
    lldb/test/API/lang/objc/warnings-in-expr-parser/TestObjCWarningsInExprParser.py
    lldb/test/API/lang/objcxx/conflicting-names-class-update-utility-expr/TestObjCConflictingNamesForClassUpdateExpr.py
    lldb/test/API/lang/objcxx/cpp_keywords_enabled/TestObjCppKeywordsEnabled.py
    lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py
    lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py
    lldb/test/API/lang/objcxx/objc-builtin-types/TestObjCBuiltinTypes.py
    lldb/test/API/linux/aarch64/mte_memory_region/TestAArch64LinuxMTEMemoryRegion.py
    lldb/test/API/linux/aarch64/mte_tag_access/TestAArch64LinuxMTEMemoryTagAccess.py
    lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py
    lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py
    lldb/test/API/linux/aarch64/tagged_memory_access/TestAArch64LinuxTaggedMemoryAccess.py
    lldb/test/API/linux/aarch64/tagged_memory_region/TestAArch64LinuxTaggedMemoryRegion.py
    lldb/test/API/linux/aarch64/unwind_signal/TestUnwindSignal.py
    lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py
    lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py
    lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
    lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py
    lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
    lldb/test/API/lua_api/TestLuaAPI.py
    lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py
    lldb/test/API/macosx/add-dsym/TestAddDsymDownload.py
    lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
    lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py
    lldb/test/API/macosx/corefile-default-ptrauth/TestCorefileDefaultPtrauth.py
    lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
    lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
    lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py
    lldb/test/API/macosx/dyld-trie-symbols/TestDyldTrieSymbols.py
    lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py
    lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
    lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py
    lldb/test/API/macosx/function-starts/TestFunctionStarts.py
    lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
    lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py
    lldb/test/API/macosx/lc-note/addrable-bits/TestAddrableBitsCorefile.py
    lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py
    lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py
    lldb/test/API/macosx/load-kext/TestLoadKext.py
    lldb/test/API/macosx/macCatalyst/TestMacCatalyst.py
    lldb/test/API/macosx/macCatalystAppMacOSFramework/TestMacCatalystAppWithMacOSFramework.py
    lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py
    lldb/test/API/macosx/order/TestOrderFile.py
    lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py
    lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
    lldb/test/API/macosx/queues/TestQueues.py
    lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py
    lldb/test/API/macosx/save_crashlog/TestSaveCrashlog.py
    lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
    lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
    lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
    lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py
    lldb/test/API/macosx/thread_suspend/TestInternalThreadSuspension.py
    lldb/test/API/macosx/universal/TestUniversal.py
    lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py
    lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py
    lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py
    lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
    lldb/test/API/python_api/debugger/TestDebuggerAPI.py
    lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
    lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
    lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
    lldb/test/API/python_api/event/TestEvents.py
    lldb/test/API/python_api/file_handle/TestFileHandle.py
    lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py
    lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
    lldb/test/API/python_api/frame/TestFrames.py
    lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
    lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
    lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
    lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
    lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py
    lldb/test/API/python_api/hello_world/TestHelloWorld.py
    lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
    lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py
    lldb/test/API/python_api/lldbutil/TestSwigVersion.py
    lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
    lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
    lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
    lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
    lldb/test/API/python_api/module_section/TestModuleAndSection.py
    lldb/test/API/python_api/name_lookup/TestNameLookup.py
    lldb/test/API/python_api/objc_type/TestObjCType.py
    lldb/test/API/python_api/process/TestProcessAPI.py
    lldb/test/API/python_api/process/io/TestProcessIO.py
    lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py
    lldb/test/API/python_api/sbdata/TestSBData.py
    lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py
    lldb/test/API/python_api/sberror/TestSBError.py
    lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py
    lldb/test/API/python_api/sbmodule/TestSBModule.py
    lldb/test/API/python_api/sbplatform/TestSBPlatform.py
    lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py
    lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py
    lldb/test/API/python_api/section/TestSectionAPI.py
    lldb/test/API/python_api/signals/TestSignalsAPI.py
    lldb/test/API/python_api/symbol-context/TestSymbolContext.py
    lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
    lldb/test/API/python_api/target/TestTargetAPI.py
    lldb/test/API/python_api/thread/TestThreadAPI.py
    lldb/test/API/python_api/type/TestTypeList.py
    lldb/test/API/python_api/value/TestValueAPI.py
    lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
    lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
    lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
    lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
    lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
    lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
    lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
    lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
    lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
    lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
    lldb/test/API/qemu/TestQemuAPI.py
    lldb/test/API/qemu/TestQemuLaunch.py
    lldb/test/API/repl/clang/TestClangREPL.py
    lldb/test/API/sample_test/TestSampleTest.py
    lldb/test/API/sanity/TestModuleCacheSanity.py
    lldb/test/API/sanity/TestReprStrEquality.py
    lldb/test/API/sanity/TestSettingSkipping.py
    lldb/test/API/source-manager/TestSourceManager.py
    lldb/test/API/symbol_ondemand/breakpoint_language/TestBreakpointLanguageOnDemand.py
    lldb/test/API/symbol_ondemand/breakpoint_source_regex/TestSourceTextRegexBreakpoint.py
    lldb/test/API/symbol_ondemand/shared_library/TestSharedLibOnDemand.py
    lldb/test/API/terminal/TestEditline.py
    lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
    lldb/test/API/test_utils/TestDecorators.py
    lldb/test/API/test_utils/TestInlineTest.py
    lldb/test/API/test_utils/TestPExpectTest.py
    lldb/test/API/test_utils/base/TestBaseTest.py
    lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAttachOrWait.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAttachWait.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteCompletion.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteFork.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteSaveCore.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
    lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
    lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
    lldb/test/API/tools/lldb-server/TestPtyServer.py
    lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
    lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
    lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
    lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
    lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
    lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
    lldb/test/API/tools/lldb-server/memory-tagging/TestGdbRemoteMemoryTagging.py
    lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
    lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
    lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
    lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
    lldb/test/API/tools/lldb-server/vCont-threads/TestGdbRemote_vContThreads.py
    lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py
    lldb/test/API/tools/lldb-vscode/breakpoint-events/TestVSCode_breakpointEvents.py
    lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py
    lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py
    lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
    lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py
    lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
    lldb/test/API/tools/lldb-vscode/console/TestVSCode_redirection_to_console.py
    lldb/test/API/tools/lldb-vscode/coreFile/TestVSCode_coreFile.py
    lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
    lldb/test/API/tools/lldb-vscode/disconnect/TestVSCode_disconnect.py
    lldb/test/API/tools/lldb-vscode/evaluate/TestVSCode_evaluate.py
    lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py
    lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
    lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
    lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py
    lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py
    lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py
    lldb/test/API/tools/lldb-vscode/stop-hooks/TestVSCode_stop_hooks.py
    lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
    lldb/test/API/types/HideTestFailures.py
    lldb/test/API/types/TestCharType.py
    lldb/test/API/types/TestCharTypeExpr.py
    lldb/test/API/types/TestDoubleTypes.py
    lldb/test/API/types/TestDoubleTypesExpr.py
    lldb/test/API/types/TestFloatTypes.py
    lldb/test/API/types/TestFloatTypesExpr.py
    lldb/test/API/types/TestIntegerType.py
    lldb/test/API/types/TestIntegerTypeExpr.py
    lldb/test/API/types/TestLongTypes.py
    lldb/test/API/types/TestLongTypesExpr.py
    lldb/test/API/types/TestRecursiveTypes.py
    lldb/test/API/types/TestShortType.py
    lldb/test/API/types/TestShortTypeExpr.py
    lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/README-TestSuite b/lldb/packages/Python/lldbsuite/test/README-TestSuite
index b29b5a3320cf3..4e1a8c093852b 100644
--- a/lldb/packages/Python/lldbsuite/test/README-TestSuite
+++ b/lldb/packages/Python/lldbsuite/test/README-TestSuite
@@ -33,9 +33,7 @@ to the Python test suite under the current 'test' directory.
 
   ./command_source/TestCommandSource.py provides a simple example of test case
   which overrides lldbtest.TestBase to exercise the lldb's 'command source'
-  command.  The subclass should override the attribute 'mydir' in order for the
-  runtime to locate the individual test cases when running as part of a large
-  test suite or when running each test case as a separate Python invocation.
+  command.
 
   The doc string provides more details about the setup required for running a
   test case on its own.  To run the whole test suite, 'dotest.py' is all you

diff  --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index c3dc2a9836113..22851730153e0 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -4,10 +4,6 @@
 The concrete subclass can override lldbtest.TestBase in order to inherit the
 common behavior for unitest.TestCase.setUp/tearDown implemented in this file.
 
-The subclass should override the attribute mydir in order for the python runtime
-to locate the individual test cases when running as part of a large test suite
-or when running each test case as a separate python invocation.
-
 ./dotest.py provides a test driver which sets up the environment to run the
 entire of part of the test suite .  Example:
 
@@ -539,7 +535,9 @@ def setUpClass(cls):
         Do current directory manipulation.
         """
         # Fail fast if 'mydir' attribute is not overridden.
-        if not cls.mydir or len(cls.mydir) == 0:
+        if not cls.mydir:
+            cls.mydir = Base.compute_mydir(sys.modules[cls.__module__].__file__)
+        if not cls.mydir:
             raise Exception("Subclasses must override the 'mydir' attribute.")
 
         # Save old working directory.
@@ -1703,11 +1701,6 @@ class TestBase(Base):
 
     Important things for test class writers:
 
-        - Overwrite the mydir class attribute, otherwise your test class won't
-          run.  It specifies the relative directory to the top level 'test' so
-          the test harness can change to the correct working directory before
-          running your test.
-
         - The setUp method sets up things to facilitate subsequent interactions
           with the debugger as part of the test.  These include:
               - populate the test method name

diff  --git a/lldb/test/API/android/platform/TestDefaultCacheLineSize.py b/lldb/test/API/android/platform/TestDefaultCacheLineSize.py
index 875d1e54bd7be..7e8f88e77c5a8 100644
--- a/lldb/test/API/android/platform/TestDefaultCacheLineSize.py
+++ b/lldb/test/API/android/platform/TestDefaultCacheLineSize.py
@@ -11,8 +11,6 @@
 
 
 class DefaultCacheLineSizeTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessTargetAndroid

diff  --git a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
index 6f95cd7959ea4..2c871ac44e254 100644
--- a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -12,8 +12,6 @@
 
 
 class SBDirCheckerCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py b/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
index 1de460a5ac43a..7ae74625d0200 100644
--- a/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
+++ b/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
@@ -9,8 +9,6 @@
 
 
 class TestSBCommandReturnObject(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNoSBHeaders

diff  --git a/lldb/test/API/api/listeners/TestListener.py b/lldb/test/API/api/listeners/TestListener.py
index 2f77ea2c44f9f..a8c36574d02e7 100644
--- a/lldb/test/API/api/listeners/TestListener.py
+++ b/lldb/test/API/api/listeners/TestListener.py
@@ -10,8 +10,6 @@
 import six
 
 class ListenToModuleLoadedEvents (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_clearing_listener(self):

diff  --git a/lldb/test/API/api/log/TestAPILog.py b/lldb/test/API/api/log/TestAPILog.py
index 3c340f1cafc71..831b1aad97831 100644
--- a/lldb/test/API/api/log/TestAPILog.py
+++ b/lldb/test/API/api/log/TestAPILog.py
@@ -11,8 +11,6 @@
 
 class APILogTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_api_log(self):

diff  --git a/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
index d3a69a10baa56..40065ce69f85d 100644
--- a/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -13,8 +13,6 @@
 
 class TestMultipleSimultaneousDebuggers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNoSBHeaders

diff  --git a/lldb/test/API/api/multiple-targets/TestMultipleTargets.py b/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
index 02b231f219914..1d5b1cd270df4 100644
--- a/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
+++ b/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
@@ -12,8 +12,6 @@
 
 
 class TestMultipleTargets(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"])

diff  --git a/lldb/test/API/api/multithreaded/TestMultithreaded.py b/lldb/test/API/api/multithreaded/TestMultithreaded.py
index 71bc5db287296..f8681dd75fc13 100644
--- a/lldb/test/API/api/multithreaded/TestMultithreaded.py
+++ b/lldb/test/API/api/multithreaded/TestMultithreaded.py
@@ -25,8 +25,6 @@ def setUp(self):
         self.generateSource('test_listener_resume.cpp')
         self.generateSource('test_stop-hook.cpp')
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     @skipIfNoSBHeaders
     # clang-cl does not support throw or catch (llvm.org/pr24538)

diff  --git a/lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py b/lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py
index 35ea3ae222a24..7d8da022b75ec 100644
--- a/lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py
+++ b/lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py
@@ -11,8 +11,6 @@
 
 
 class TestBreakpointIt(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(archs=no_match(["arm"]))

diff  --git a/lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py b/lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py
index d472b79fb87a2..c318f741e9fbe 100644
--- a/lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py
+++ b/lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py
@@ -12,8 +12,6 @@
 
 class TestBreakpointThumbCodesection(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(archs=no_match(["arm"]))
     @skipIf(archs=["arm64"])
     @skipIfDarwinEmbedded   # codegen on darwin always defaults to thumb for armv7/armv7k targets

diff  --git a/lldb/test/API/arm/emulation/TestEmulations.py b/lldb/test/API/arm/emulation/TestEmulations.py
index 9613edcf3fd9a..800ac8bf98206 100644
--- a/lldb/test/API/arm/emulation/TestEmulations.py
+++ b/lldb/test/API/arm/emulation/TestEmulations.py
@@ -14,8 +14,6 @@
 
 class ARMEmulationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_thumb_emulations(self):
         test_dir = os.path.join(self.getSourceDir(), "new-test-files")

diff  --git a/lldb/test/API/assert_messages_test/TestAssertMessages.py b/lldb/test/API/assert_messages_test/TestAssertMessages.py
index 7127311ac5b5e..6d7a54c661d49 100644
--- a/lldb/test/API/assert_messages_test/TestAssertMessages.py
+++ b/lldb/test/API/assert_messages_test/TestAssertMessages.py
@@ -11,8 +11,6 @@
 
 
 class AssertMessagesTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def assert_expect_fails_with(self, cmd, expect_args, expected_msg):

diff  --git a/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
index 7863481ebe9c6..9338e4677e8fc 100644
--- a/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
@@ -14,8 +14,6 @@
 
 class TestBenchmarkContinue(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark 
diff erent ways to continue a process"""

diff  --git a/lldb/test/API/benchmarks/expression/TestExpressionCmd.py b/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
index 9e5b0ecc5b36b..19dfcb6b465ef 100644
--- a/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
@@ -14,8 +14,6 @@
 
 class ExpressionEvaluationCase(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.source = 'main.cpp'

diff  --git a/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
index 438a1fdd30a89..9ce1ab410caff 100644
--- a/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
@@ -14,8 +14,6 @@
 
 class RepeatedExprsCase(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.source = 'main.cpp'

diff  --git a/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
index 5261204beeabb..87d3eb139dc41 100644
--- a/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -13,8 +13,6 @@
 
 class FrameVariableResponseBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

diff  --git a/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py b/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
index 5ad59f34dbf9a..11585eb34eb85 100644
--- a/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
+++ b/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
@@ -14,8 +14,6 @@
 
 class TestBenchmarkLibcxxList(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark the std::list data formatter (libc++)"""

diff  --git a/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py b/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
index ba5ba084c8b62..4fcbcb1ebe715 100644
--- a/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
+++ b/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
@@ -14,8 +14,6 @@
 
 class TestBenchmarkLibcxxMap(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark the std::map data formatter (libc++)"""

diff  --git a/lldb/test/API/benchmarks/startup/TestStartupDelays.py b/lldb/test/API/benchmarks/startup/TestStartupDelays.py
index 104b5d74c74aa..b6533b8533c92 100644
--- a/lldb/test/API/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/test/API/benchmarks/startup/TestStartupDelays.py
@@ -13,8 +13,6 @@
 
 class StartupDelaysBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         # Create self.stopwatch2 for measuring "set first breakpoint".

diff  --git a/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
index 60e4a42108ae3..dbaf8985713fa 100644
--- a/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
@@ -14,8 +14,6 @@
 
 class SteppingSpeedBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

diff  --git a/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index 88fc7455cc3a2..dbd05dbca0ecd 100644
--- a/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -14,8 +14,6 @@
 
 class CompileRunToBreakpointBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

diff  --git a/lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py b/lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py
index 803f44a5dfded..65439bbcdaffa 100644
--- a/lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py
+++ b/lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py
@@ -13,8 +13,6 @@
 @skipUnlessDarwin
 class AddDsymCommandCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.template = 'main.cpp.template'

diff  --git a/lldb/test/API/commands/apropos/basic/TestApropos.py b/lldb/test/API/commands/apropos/basic/TestApropos.py
index 920f0dd0b2455..fa8bc9cdc7a8a 100644
--- a/lldb/test/API/commands/apropos/basic/TestApropos.py
+++ b/lldb/test/API/commands/apropos/basic/TestApropos.py
@@ -4,8 +4,6 @@
 
 class AproposTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_apropos(self):
         self.expect("apropos", error=True,

diff  --git a/lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py b/lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
index e2cf10e667b85..d81921258efa3 100644
--- a/lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
+++ b/lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
@@ -10,8 +10,6 @@
 
 
 class AproposWithProcessTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py b/lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py
index f1a8656a73b55..8d613abfec3a4 100644
--- a/lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py
+++ b/lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py
@@ -8,8 +8,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_list_commands(self):
         src_dir = self.getSourceDir()

diff  --git a/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py b/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
index 1eedb266c5b47..b6b98d89d7ca0 100644
--- a/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
+++ b/lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_error(self):
         self.expect("breakpoint set --func-regex (", error=True,

diff  --git a/lldb/test/API/commands/command/container/TestContainerCommands.py b/lldb/test/API/commands/command/container/TestContainerCommands.py
index 7fcb361d50da0..2267b3528a558 100644
--- a/lldb/test/API/commands/command/container/TestContainerCommands.py
+++ b/lldb/test/API/commands/command/container/TestContainerCommands.py
@@ -10,8 +10,6 @@
 
 
 class TestCmdContainer(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_container_add(self):

diff  --git a/lldb/test/API/commands/command/delete/TestCommandDelete.py b/lldb/test/API/commands/command/delete/TestCommandDelete.py
index 3fa654d20aa90..902716ce65af4 100644
--- a/lldb/test/API/commands/command/delete/TestCommandDelete.py
+++ b/lldb/test/API/commands/command/delete/TestCommandDelete.py
@@ -4,8 +4,6 @@
 
 class DeleteCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_delete_builtin(self):
         self.expect("command delete settings", error=True,

diff  --git a/lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py b/lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py
index 3a9a4a39d89d8..2a914c06bc60e 100644
--- a/lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py
+++ b/lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py
@@ -4,8 +4,6 @@
 
 class InvalidArgsCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_script_add(self):
         self.expect("command script add 1 2", error=True,

diff  --git a/lldb/test/API/commands/command/nested_alias/TestNestedAlias.py b/lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
index bbe9c14f69f6d..29b4af335028d 100644
--- a/lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
+++ b/lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
@@ -10,8 +10,6 @@
 
 
 class NestedAliasTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/command/regex/TestRegexCommand.py b/lldb/test/API/commands/command/regex/TestRegexCommand.py
index 5a70dc919f7f8..085622c055716 100644
--- a/lldb/test/API/commands/command/regex/TestRegexCommand.py
+++ b/lldb/test/API/commands/command/regex/TestRegexCommand.py
@@ -10,8 +10,6 @@
 
 class TestCommandRegexParsing(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_sample_rename_this(self):

diff  --git a/lldb/test/API/commands/command/script/TestCommandScript.py b/lldb/test/API/commands/command/script/TestCommandScript.py
index eed36c95ec32c..6f369470803f9 100644
--- a/lldb/test/API/commands/command/script/TestCommandScript.py
+++ b/lldb/test/API/commands/command/script/TestCommandScript.py
@@ -10,8 +10,6 @@
 
 
 class CmdPythonTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/commands/command/script/import/TestImport.py b/lldb/test/API/commands/command/script/import/TestImport.py
index a10c23bad1f72..ff1fd145ce395 100644
--- a/lldb/test/API/commands/command/script/import/TestImport.py
+++ b/lldb/test/API/commands/command/script/import/TestImport.py
@@ -10,8 +10,6 @@
 
 class ImportTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @no_debug_info_test
     def test_import_command(self):

diff  --git a/lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py
index 478cfa38d037c..7fff13561d294 100644
--- a/lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py
@@ -10,8 +10,6 @@
 
 class Rdar12586188TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @no_debug_info_test
     def test_rdar12586188_command(self):

diff  --git a/lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py b/lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py
index 3f2e8ccec29ef..0d80fb98eecab 100644
--- a/lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py
+++ b/lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py
@@ -9,8 +9,6 @@
 
 
 class CommandScriptAliasTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_pycmd(self):

diff  --git a/lldb/test/API/commands/command/source/TestCommandSource.py b/lldb/test/API/commands/command/source/TestCommandSource.py
index dc32e20ddba0a..f75ab5a1ed15f 100644
--- a/lldb/test/API/commands/command/source/TestCommandSource.py
+++ b/lldb/test/API/commands/command/source/TestCommandSource.py
@@ -12,8 +12,6 @@
 
 class CommandSourceTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_command_source(self):
         """Test that lldb command "command source" works correctly."""

diff  --git a/lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py b/lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py
index 4130aae96210e..da8beb817e2a3 100644
--- a/lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py
+++ b/lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py
@@ -11,8 +11,6 @@
 
 
 class DisassemblyTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py b/lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py
index e76cbd8d61380..23de46efc1147 100644
--- a/lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py
+++ b/lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py
@@ -11,8 +11,6 @@
 
 class FrameDisassembleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_frame_disassemble(self):

diff  --git a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
index 1a4e166100427..12c2bdfc255f3 100644
--- a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
+++ b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
@@ -13,7 +13,6 @@
 from lldbsuite.test import lldbutil
 
 class TestExprLookupAnonStructTypedef(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=['linux'],

diff  --git a/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py b/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
index 1e2fa1bb18625..f34a698546334 100644
--- a/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
+++ b/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
@@ -17,8 +17,6 @@
 
 class TestArgumentPassingRestrictions(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   @skipIf(compiler="clang", compiler_version=['<', '7.0'])
   def test_argument_passing_restrictions(self):
     self.build()

diff  --git a/lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py b/lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py
index 9cd3c81704704..e66c19916f221 100644
--- a/lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py
+++ b/lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py
@@ -11,8 +11,6 @@
 
 
 class TestCalculatorMode(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test__calculator_mode(self):

diff  --git a/lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py b/lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py
index 4fd5cd6eddd5a..2af1e3e2cc604 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py
@@ -12,8 +12,6 @@
 
 class ExprCommandCallBuiltinFunction(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Builtins are expanded by Clang, so debug info shouldn't matter.
     NO_DEBUG_INFO_TESTCASE = True
 

diff  --git a/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py b/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
index b3a61191480b2..2aaaa550194f0 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
@@ -9,8 +9,6 @@
 
 class ExprCommandCallFunctionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         compiler="icc",
         bugnumber="llvm.org/pr14437, fails with ICC 13.1")

diff  --git a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
index 1191176aa706b..2687cb380ec6f 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
@@ -8,8 +8,6 @@
 
 class ExprCommandCallStopContinueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
index 8ea7744873fe8..c818913307370 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
@@ -14,8 +14,6 @@
 
 class ExprCommandCallUserDefinedFunction(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test return values of user defined function calls."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py b/lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py
index c910b4dd37e15..487c55f2bb3bb 100644
--- a/lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py
+++ b/lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py
@@ -11,8 +11,6 @@
 
 
 class ExprCommandThatRestartsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py b/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
index 2ee8bfd1dd595..40a7f23a9cc00 100644
--- a/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
+++ b/lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py
@@ -12,8 +12,6 @@
 
 class ExprCommandWithThrowTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
index 7c1a4e8479235..4c1875c377c93 100644
--- a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
+++ b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
@@ -11,8 +11,6 @@
 
 class TestCastIntToAnonymousEnum(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_cast_int_to_anonymous_enum(self):
         self.build()
 

diff  --git a/lldb/test/API/commands/expression/char/TestExprsChar.py b/lldb/test/API/commands/expression/char/TestExprsChar.py
index ab3d4f40265ff..cd9c55b5a44bb 100644
--- a/lldb/test/API/commands/expression/char/TestExprsChar.py
+++ b/lldb/test/API/commands/expression/char/TestExprsChar.py
@@ -5,8 +5,6 @@
 
 class ExprCharTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def do_test(self, dictionary=None):
         """These basic expression commands should work as expected."""
         self.build(dictionary=dictionary)

diff  --git a/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
index 50bba10aa368b..e7ad9a9044f13 100644
--- a/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
+++ b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
@@ -12,8 +12,6 @@
 
 class TestClassTemplateSpecializationParametersHandling(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_class_template_specialization(self):
         self.build()
 

diff  --git a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
index a485b94a680dc..652df838edee1 100644
--- a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
+++ b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
@@ -5,8 +5,6 @@
 
 class TestImportDefinitionArrayType(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py b/lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py
index 18897e5cd2026..2a86ad19653f7 100644
--- a/lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py
+++ b/lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf # rdar://problem/53931074
     def test(self):
         self.build()

diff  --git a/lldb/test/API/commands/expression/completion/TestExprCompletion.py b/lldb/test/API/commands/expression/completion/TestExprCompletion.py
index 7c5fb4cffa235..d1d39c6cedacc 100644
--- a/lldb/test/API/commands/expression/completion/TestExprCompletion.py
+++ b/lldb/test/API/commands/expression/completion/TestExprCompletion.py
@@ -11,8 +11,6 @@
 
 class CommandLineExprCompletionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_expr_completion(self):

diff  --git a/lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py b/lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py
index eb43a59667cb4..a5f01f3ceec76 100644
--- a/lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py
+++ b/lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py
@@ -9,8 +9,6 @@
 
 class ContextObjectObjcTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["objc"])
     def test_context_object_objc(self):
         """Tests expression evaluation in context of an objc class."""

diff  --git a/lldb/test/API/commands/expression/context-object/TestContextObject.py b/lldb/test/API/commands/expression/context-object/TestContextObject.py
index b7dc6d53dc47c..a53cbac306503 100644
--- a/lldb/test/API/commands/expression/context-object/TestContextObject.py
+++ b/lldb/test/API/commands/expression/context-object/TestContextObject.py
@@ -8,8 +8,6 @@
 
 class ContextObjectTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_context_object(self):
         """Tests expression evaluation in context of an object."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
index c7b75966e1a04..4f867a6385f18 100644
--- a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
+++ b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
@@ -9,8 +9,6 @@
 
 class ExprDiagnosticsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
index d15eae304a4ca..70000739d3f8a 100644
--- a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
+++ b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"])
     def test(self):
         self.build()

diff  --git a/lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py b/lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py
index bd62e30b7fc19..54e2a6b44a964 100644
--- a/lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py
+++ b/lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py
@@ -11,8 +11,6 @@
 
 class TestAllowJIT(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py b/lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py
index fe3fd85273949..8c376cfddd1cd 100644
--- a/lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py
+++ b/lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py
@@ -8,8 +8,6 @@
 
 class ExprEntryBPTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_expr_entry_bp(self):

diff  --git a/lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py b/lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py
index c940edbb90c53..e7391d229641e 100644
--- a/lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py
+++ b/lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         # FIXME: The only reason this test needs to create a real target is because

diff  --git a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
index d433e2e400ae3..4c20c7f535ccc 100644
--- a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
@@ -8,8 +8,6 @@
 
 class ExprSyscallTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["windows"],
         bugnumber="llvm.org/pr21765, getpid() does not exist on Windows")

diff  --git a/lldb/test/API/commands/expression/fixits/TestFixIts.py b/lldb/test/API/commands/expression/fixits/TestFixIts.py
index 686f56ad7974d..bf4118d1b9d86 100644
--- a/lldb/test/API/commands/expression/fixits/TestFixIts.py
+++ b/lldb/test/API/commands/expression/fixits/TestFixIts.py
@@ -10,8 +10,6 @@
 
 class ExprCommandWithFixits(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_dummy_target(self):
         """Test calling expressions in the dummy target with errors that can be fixed by the FixIts."""
 

diff  --git a/lldb/test/API/commands/expression/formatters/TestFormatters.py b/lldb/test/API/commands/expression/formatters/TestFormatters.py
index dda773e29e917..f6eeeb2abe96c 100644
--- a/lldb/test/API/commands/expression/formatters/TestFormatters.py
+++ b/lldb/test/API/commands/expression/formatters/TestFormatters.py
@@ -12,8 +12,6 @@
 
 class ExprFormattersTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py b/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
index ecbc7ead6dcb8..5bbed6e887510 100644
--- a/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
+++ b/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
@@ -5,8 +5,6 @@
 
 class TestFunctionTemplateSpecializationTempArgs(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_function_template_specialization_temp_args(self):
         self.build()
 

diff  --git a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
index ba9a7853b2f64..fdf96b35f6a64 100644
--- a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py b/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
index 695d00b08a0f5..47021d7f6f979 100644
--- a/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py
@@ -9,8 +9,6 @@
 
 class ImportStdModule(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py b/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
index bfc1851cd1777..d5b645119428f 100644
--- a/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
+++ b/lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
@@ -14,8 +14,6 @@
 
 class TestImportStdModuleConflicts(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
index 0eaa50a127279..26b3dbf3c1b0a 100644
--- a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestBasicDeque(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
index 5a1f1fc4d6ac3..b66477cb3d98a 100644
--- a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestDbgInfoContentDeque(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
index 289420a9491e8..5c7c5a176f52c 100644
--- a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
@@ -10,8 +10,6 @@
 
 class ImportStdModule(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We only emulate a fake libc++ in this test and don't use the real libc++,
     # but we still add the libc++ category so that this test is only run in
     # test configurations where libc++ is actually supposed to be tested.

diff  --git a/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
index e3b3705c332a5..943aa5b777252 100644
--- a/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We only emulate a fake libc++ in this test and don't use the real libc++,
     # but we still add the libc++ category so that this test is only run in
     # test configurations where libc++ is actually supposed to be tested.

diff  --git a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
index b1f206d72197d..1f66452feae40 100644
--- a/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestDbgInfoContentForwardList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
index 9c4bf83cfcb8f..08a680df1cfef 100644
--- a/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestBasicForwardList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
index b040b37f59480..33c08fbc0b996 100644
--- a/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
index 94d9ca72b2203..b4740d2f5224a 100644
--- a/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
@@ -10,8 +10,6 @@
 
 class TestDbgInfoContentList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
index 0d7d915fcaa5f..9f1fc372e62ea 100644
--- a/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestBasicList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py b/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
index 9e11ec62152a2..41fb4b5712dfb 100644
--- a/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
+++ b/lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py
@@ -11,8 +11,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We only emulate a fake libc++ in this test and don't use the real libc++,
     # but we still add the libc++ category so that this test is only run in
     # test configurations where libc++ is actually supposed to be tested.

diff  --git a/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py b/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
index 55e6d420b64b7..73d50a7b6fab2 100644
--- a/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
+++ b/lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py
@@ -14,8 +14,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We only emulate a fake libc++ in this test and don't use the real libc++,
     # but we still add the libc++ category so that this test is only run in
     # test configurations where libc++ is actually supposed to be tested.

diff  --git a/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py b/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
index 50aaf10949b0b..a6e664f6bd051 100644
--- a/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
@@ -15,8 +15,6 @@
 
 class STLTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py b/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
index 0296b736bf78b..8f40e92e70d24 100644
--- a/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
+++ b/lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
index 121b6e7420349..debd80bba949d 100644
--- a/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     # FIXME: This regressed in 69d5a6662115499198ebfa07a081e98a6ce4b915

diff  --git a/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
index 06f77ba5a9e72..59df9cf449cd3 100644
--- a/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestQueue(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py b/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
index 1ba80ca1d011b..e102939375297 100644
--- a/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
index 46a796fea9b35..6991324d1f850 100644
--- a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestSharedPtrDbgInfoContent(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
index 0d0f300776bc5..0f7e1a20a8293 100644
--- a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestSharedPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
index 4486768e2909e..ab3b0c7a2392a 100644
--- a/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py
@@ -8,8 +8,6 @@
 
 class TestStack(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIfLinux # Declaration in some Linux headers causes LLDB to crash.

diff  --git a/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py b/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
index d26eccf29986f..014a35458d66f 100644
--- a/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
+++ b/lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
@@ -10,8 +10,6 @@
 
 class ImportStdModule(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We only emulate a fake libc++ in this test and don't use the real libc++,
     # but we still add the libc++ category so that this test is only run in
     # test configurations where libc++ is actually supposed to be tested.

diff  --git a/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
index 5fba71d023fe5..c32c971e66a83 100644
--- a/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
+++ b/lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
@@ -9,8 +9,6 @@
 
 class TestUniquePtrDbgInfoContent(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler="clang", compiler_version=['<', '9.0'])

diff  --git a/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
index f8e1aa708f57c..6775a53e39e3b 100644
--- a/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestUniquePtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler="clang", compiler_version=['<', '9.0'])

diff  --git a/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
index 79e7478e485e3..024b61eb25c3c 100644
--- a/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestBoolVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
index d53a9bfb59014..92dfa02b41733 100644
--- a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
@@ -10,8 +10,6 @@
 
 class TestDbgInfoContentVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
index 46633cacd6add..8a98900e292e0 100644
--- a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestVectorOfVectors(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
index 1b93fa2664611..b83e50d6e6c06 100644
--- a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestBasicVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
index d99d5cec86b39..5eebed7fa62e2 100644
--- a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestDbgInfoContentWeakPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
index 6e1b13375f03a..8d1c72147fc42 100644
--- a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
@@ -9,8 +9,6 @@
 
 class TestSharedPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

diff  --git a/lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py b/lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
index 1de1103eb6bda..b7e25b59c94bf 100644
--- a/lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
+++ b/lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
@@ -12,8 +12,6 @@
 
 class TestImportBuiltinFileID(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfDarwinEmbedded
     @add_test_categories(["gmodules", "objc"])
     def test_import_builtin_fileid(self):

diff  --git a/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py b/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
index fea92c64699d7..1772d61d29618 100644
--- a/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
+++ b/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
@@ -10,7 +10,6 @@
 
 
 class TestInlineNamespace(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test(self):
         self.build()

diff  --git a/lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py b/lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py
index e0ede0a4e2d07..859b823071c4a 100644
--- a/lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py
+++ b/lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py
@@ -4,8 +4,6 @@
 
 class InvalidArgsExpressionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_lang(self):
         self.expect("expression -l foo --", error=True,

diff  --git a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
index 20a9477b1f7ae..0f7237c8e24b9 100644
--- a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
+++ b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
@@ -9,7 +9,6 @@
 
 
 class IRInterpreterPHINodesTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_phi_node_support(self):
         """Test support for PHI nodes in the IR interpreter."""

diff  --git a/lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py b/lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py
index 16c88c53ef1ac..5dbc53ef21dc3 100644
--- a/lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py
+++ b/lldb/test/API/commands/expression/ir-interpreter/TestIRInterpreter.py
@@ -12,8 +12,6 @@
 
 
 class IRInterpreterTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/expression/issue_11588/Test11588.py b/lldb/test/API/commands/expression/issue_11588/Test11588.py
index 9f743fb7779b2..3385f86bffe06 100644
--- a/lldb/test/API/commands/expression/issue_11588/Test11588.py
+++ b/lldb/test/API/commands/expression/issue_11588/Test11588.py
@@ -14,8 +14,6 @@
 
 class Issue11581TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows #This test is now flaky on windows, see llvm.org/pr24778
     def test_11581_commands(self):
         # This is the function to remove the custom commands in order to have a

diff  --git a/lldb/test/API/commands/expression/macros/TestMacros.py b/lldb/test/API/commands/expression/macros/TestMacros.py
index aed83e224e58e..3e5d720aef77b 100644
--- a/lldb/test/API/commands/expression/macros/TestMacros.py
+++ b/lldb/test/API/commands/expression/macros/TestMacros.py
@@ -8,8 +8,6 @@
 
 class TestMacros(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         compiler="clang",
         bugnumber="clang does not emit .debug_macro[.dwo] sections.")

diff  --git a/lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py b/lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py
index d580d936dc4a2..550e4849c0468 100644
--- a/lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py
+++ b/lldb/test/API/commands/expression/multiline-completion/TestMultilineCompletion.py
@@ -9,8 +9,6 @@
 
 class MultilineCompletionTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def start_expression_editor(self):
         """ Starts the multiline expression editor. """
         self.child.send("expression\n")

diff  --git a/lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py b/lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py
index 1026de6e491ce..217550e29dfcd 100644
--- a/lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py
+++ b/lldb/test/API/commands/expression/multiline-navigation/TestMultilineNavigation.py
@@ -9,8 +9,6 @@
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     arrow_up = "\033[A"
     arrow_down = "\033[B"
 

diff  --git a/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py b/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
index 8bf5df0f5d9c9..a446c7810f3c4 100644
--- a/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
+++ b/lldb/test/API/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
@@ -5,8 +5,6 @@
 
 class TestNamespaceLocalVarSameNameCppAndC(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @add_test_categories(["gmodules"])
     def test_namespace_local_var_same_name_cpp_and_c(self):

diff  --git a/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
index 92efbdd306c10..b0c6be417aa80 100644
--- a/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
+++ b/lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
@@ -5,8 +5,6 @@
 
 class TestNamespaceLocalVarSameNameObjC(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["gmodules", "objc"])
     def test_namespace_local_var_same_name_obj_c(self):
         self.build()

diff  --git a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
index 280236688f043..96536d7a61351 100644
--- a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
@@ -13,8 +13,6 @@
 
 class ExprDoesntDeadlockTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["basic_process"])
     def test_with_run_command(self):
         """Test that expr will time out and allow other threads to run if it blocks."""

diff  --git a/lldb/test/API/commands/expression/options/TestExprOptions.py b/lldb/test/API/commands/expression/options/TestExprOptions.py
index 1f56e5fb09719..b557914315f1e 100644
--- a/lldb/test/API/commands/expression/options/TestExprOptions.py
+++ b/lldb/test/API/commands/expression/options/TestExprOptions.py
@@ -17,8 +17,6 @@
 
 class ExprOptionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index 8562a4fb3a70d..4113e9d55fd53 100644
--- a/lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -12,8 +12,6 @@
 
 class PersistObjCPointeeType(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
index 5660113b8b432..61687a04717aa 100644
--- a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -11,8 +11,6 @@
 
 class PersistentPtrUpdateTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test that we can have persistent pointer variables"""
         self.build()

diff  --git a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
index 973eade3e56a6..2ecac03b4dea4 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
@@ -12,8 +12,6 @@
 
 class NestedPersistentTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_persistent_types(self):
         """Test that nested persistent types work."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
index e60a76861b6dd..d9a2694b0b91d 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
@@ -12,8 +12,6 @@
 
 class PersistenttypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_persistent_types(self):
         """Test that lldb persistent types works correctly."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
index bdd1ccc596964..162457342bf03 100644
--- a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
@@ -10,8 +10,6 @@
 
 class PersistentVariablesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_persistent_variables(self):
         """Test that lldb persistent variables works correctly."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py b/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py
index a4c632dff2bbd..a9131360fef6e 100644
--- a/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py
+++ b/lldb/test/API/commands/expression/po_verbosity/TestPoVerbosity.py
@@ -12,8 +12,6 @@
 
 class PoVerbosityTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py b/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
index a9987ce3ed523..faa59ab4a7f8f 100644
--- a/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
+++ b/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
@@ -6,8 +6,6 @@
 
 class ExprBug35310(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
index 68e5323ac35eb..c5b6fea44ed96 100644
--- a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
+++ b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
@@ -10,8 +10,6 @@
 
 class ExprCrashTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_pr52257(self):
         self.build()
         self.createTestTarget()

diff  --git a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
index 8a38a66772e9b..23e9fe9a808e5 100644
--- a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
+++ b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
@@ -10,8 +10,6 @@
 
 class Radar8638051TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_expr_commands(self):
         """The following expression commands should not crash."""
         self.build()

diff  --git a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
index 857110cad7eea..0b6507e40b9b6 100644
--- a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
@@ -12,8 +12,6 @@
 
 class Radar9531204TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # rdar://problem/9531204
     def test_expr_commands(self):
         """The evaluating printf(...) after break stop and then up a stack frame."""

diff  --git a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
index 3eb3a86adf235..135009b422f72 100644
--- a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
@@ -12,8 +12,6 @@
 
 class Radar9673644TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/result_numbering/TestResultNumbering.py b/lldb/test/API/commands/expression/result_numbering/TestResultNumbering.py
index 11429516d1f1e..296faf5845e1f 100644
--- a/lldb/test/API/commands/expression/result_numbering/TestResultNumbering.py
+++ b/lldb/test/API/commands/expression/result_numbering/TestResultNumbering.py
@@ -12,8 +12,6 @@
 
 class TestExpressionResultNumbering(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_sample_rename_this(self):

diff  --git a/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py b/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
index 381527ca95963..157bed4880a3d 100644
--- a/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
+++ b/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
@@ -10,7 +10,6 @@
 from lldbsuite.test import lldbutil
 
 class SaveJITObjectsTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def enumerateJITFiles(self):
         return [f for f in os.listdir(self.getBuildDir()) if f.startswith("jit")]

diff  --git a/lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py b/lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py
index 2c45d213e4df0..3a53e8f4be17a 100644
--- a/lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py
+++ b/lldb/test/API/commands/expression/scoped_enums/TestScopedEnumType.py
@@ -8,8 +8,6 @@
 
 class ScopedEnumType(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(dwarf_version=['<', '4'])
     def test(self):
         self.build()

diff  --git a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
index 38470bb8a57db..e704c445cc63b 100644
--- a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
+++ b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
@@ -5,8 +5,6 @@
 
 class StaticInitializers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(archs="aarch64", oslist=["freebsd", "linux"],
                         bugnumber="https://bugs.llvm.org/show_bug.cgi?id=44053")
     def test(self):

diff  --git a/lldb/test/API/commands/expression/test/TestExprs.py b/lldb/test/API/commands/expression/test/TestExprs.py
index caa1d66a1c78d..5150ff03b76c2 100644
--- a/lldb/test/API/commands/expression/test/TestExprs.py
+++ b/lldb/test/API/commands/expression/test/TestExprs.py
@@ -23,8 +23,6 @@
 
 class BasicExprCommandsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/test/TestExprs2.py b/lldb/test/API/commands/expression/test/TestExprs2.py
index cd02f89b461c9..827c13878421b 100644
--- a/lldb/test/API/commands/expression/test/TestExprs2.py
+++ b/lldb/test/API/commands/expression/test/TestExprs2.py
@@ -12,8 +12,6 @@
 
 class ExprCommands2TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py b/lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py
index e6dcec3df9b86..b3a3aac383bfc 100644
--- a/lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py
+++ b/lldb/test/API/commands/expression/timeout/TestCallWithTimeout.py
@@ -12,8 +12,6 @@
 
 class ExprCommandWithTimeoutsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
index 220332759ec4d..97547dfb5427d 100644
--- a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
+++ b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
@@ -14,8 +14,6 @@
 
 class TopLevelExpressionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index 8df489a100fcf..a40eb120759eb 100644
--- a/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/test/API/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
@@ -14,8 +14,6 @@
 
 class ObjCTypeQueryTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
index e21edef4d8064..1211e86c46eb7 100644
--- a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
+++ b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
@@ -13,8 +13,6 @@
 
 
 class UnwindFromExpressionTest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     main_spec = lldb.SBFileSpec("main.cpp", False)
 
     def build_and_run_to_bkpt(self):

diff  --git a/lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py b/lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py
index 2da95460e2497..0edc12d2870a6 100644
--- a/lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py
+++ b/lldb/test/API/commands/expression/vector_of_enums/TestVectorOfEnums.py
@@ -11,8 +11,6 @@
 
 class TestVectorOfEnums(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   @add_test_categories(["libc++"])
   def test_vector_of_enums(self):
     self.build()

diff  --git a/lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py b/lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py
index 09d998b98748d..911a97f621153 100644
--- a/lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py
+++ b/lldb/test/API/commands/expression/weak_symbols/TestWeakSymbols.py
@@ -14,8 +14,6 @@
 
 class TestWeakSymbolsInExpressions(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py b/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
index 69308a58d3f55..8ef0654b64447 100644
--- a/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
+++ b/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
@@ -5,8 +5,6 @@
 
 class ExprXValuePrintingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], archs=["i[3-6]86", "x86_64"], bugnumber="llvm.org/pr21765")
     def test(self):
         """Printing an xvalue should work."""

diff  --git a/lldb/test/API/commands/frame/diagnose/array/TestArray.py b/lldb/test/API/commands/frame/diagnose/array/TestArray.py
index 5788cacb9a2ee..0a2ecb21749ab 100644
--- a/lldb/test/API/commands/frame/diagnose/array/TestArray.py
+++ b/lldb/test/API/commands/frame/diagnose/array/TestArray.py
@@ -10,7 +10,6 @@
 
 
 class TestArray(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py b/lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py
index 2ed417be87813..89f021ec90f97 100644
--- a/lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py
+++ b/lldb/test/API/commands/frame/diagnose/bad-reference/TestBadReference.py
@@ -10,7 +10,6 @@
 
 
 class TestBadReference(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py b/lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
index c1b0a0b61f47f..4aa205e7d1796 100644
--- a/lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
+++ b/lldb/test/API/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseDereferenceArgument(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py b/lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
index e6f222a89c62a..9fc56ee9239c1 100644
--- a/lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
+++ b/lldb/test/API/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseDereferenceArgument(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py b/lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
index 25d7519e5330e..bf774065d00e9 100644
--- a/lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
+++ b/lldb/test/API/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseDereferenceFunctionReturn(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64']))  # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py b/lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
index e5d528fe3422b..2038afbdcfabd 100644
--- a/lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
+++ b/lldb/test/API/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseDereferenceThis(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py b/lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
index f006db5219a46..fbd999f9ea922 100644
--- a/lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
+++ b/lldb/test/API/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseInheritance(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py b/lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py
index 4fcfa77666c0f..41cade79d7b5b 100644
--- a/lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py
+++ b/lldb/test/API/commands/frame/diagnose/local-variable/TestLocalVariable.py
@@ -10,7 +10,6 @@
 
 
 class TestLocalVariable(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64']))  # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py b/lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
index d29d69d732293..3672c50c6c2bc 100644
--- a/lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
+++ b/lldb/test/API/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
@@ -10,7 +10,6 @@
 
 
 class TestDiagnoseVirtualMethodCall(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIf(archs=no_match(['x86_64'])) # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64

diff  --git a/lldb/test/API/commands/frame/language/TestGuessLanguage.py b/lldb/test/API/commands/frame/language/TestGuessLanguage.py
index 231f1d4238c6c..576061eaf2977 100644
--- a/lldb/test/API/commands/frame/language/TestGuessLanguage.py
+++ b/lldb/test/API/commands/frame/language/TestGuessLanguage.py
@@ -12,8 +12,6 @@
 
 class TestFrameGuessLanguage(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py b/lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py
index 284aeed701699..40942c9ba3b21 100644
--- a/lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py
+++ b/lldb/test/API/commands/frame/recognizer/TestFrameRecognizer.py
@@ -11,8 +11,6 @@
 import recognizer
 
 class FrameRecognizerTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/commands/frame/select/TestFrameSelect.py b/lldb/test/API/commands/frame/select/TestFrameSelect.py
index 2f2dd5aa49309..3fcc2d08e8860 100644
--- a/lldb/test/API/commands/frame/select/TestFrameSelect.py
+++ b/lldb/test/API/commands/frame/select/TestFrameSelect.py
@@ -8,8 +8,6 @@
 
 class TestFrameSelect(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfWindows
     def test_relative(self):

diff  --git a/lldb/test/API/commands/frame/var/TestFrameVar.py b/lldb/test/API/commands/frame/var/TestFrameVar.py
index d142e356f28e1..d6a1a14adbf35 100644
--- a/lldb/test/API/commands/frame/var/TestFrameVar.py
+++ b/lldb/test/API/commands/frame/var/TestFrameVar.py
@@ -11,8 +11,6 @@
 
 class TestFrameVar(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/commands/gui/basic/TestGuiBasic.py b/lldb/test/API/commands/gui/basic/TestGuiBasic.py
index a28754473ded0..20a2527f63fdc 100644
--- a/lldb/test/API/commands/gui/basic/TestGuiBasic.py
+++ b/lldb/test/API/commands/gui/basic/TestGuiBasic.py
@@ -9,8 +9,6 @@
 
 class BasicGuiCommandTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
index ee5a74c1f1798..c82e1f16c7851 100644
--- a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
+++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
@@ -9,8 +9,6 @@
 
 class TestGuiBasicDebugCommandTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
index 627fa7a9aed9d..c47015551afd0 100644
--- a/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
+++ b/lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
@@ -9,8 +9,6 @@
 
 class TestGuiBasicDebugCommandTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py b/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
index 34a6bf3643534..099bf3bb2ac1a 100644
--- a/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
+++ b/lldb/test/API/commands/gui/expand-threads-tree/TestGuiExpandThreadsTree.py
@@ -11,8 +11,6 @@
 
 class TestGuiExpandThreadsTree(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py b/lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py
index 11fdc92243bb1..587a0021eca6c 100644
--- a/lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py
+++ b/lldb/test/API/commands/gui/invalid-args/TestInvalidArgsGui.py
@@ -4,8 +4,6 @@
 
 class GuiTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfCursesSupportMissing
     def test_reproducer_generate_invalid_invocation(self):

diff  --git a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
index 633aa1f570088..177b32762ab67 100644
--- a/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
+++ b/lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
@@ -9,8 +9,6 @@
 
 class GuiViewLargeCommandTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/commands/help/TestHelp.py b/lldb/test/API/commands/help/TestHelp.py
index 09e7a32a854ca..6e0cfe4326636 100644
--- a/lldb/test/API/commands/help/TestHelp.py
+++ b/lldb/test/API/commands/help/TestHelp.py
@@ -15,8 +15,6 @@
 
 class HelpCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_simplehelp(self):
         """A simple test of 'help' command and its output."""

diff  --git a/lldb/test/API/commands/log/basic/TestLogging.py b/lldb/test/API/commands/log/basic/TestLogging.py
index 21d92fe92d8ed..b062da59bfb02 100644
--- a/lldb/test/API/commands/log/basic/TestLogging.py
+++ b/lldb/test/API/commands/log/basic/TestLogging.py
@@ -12,8 +12,6 @@
 
 
 class LogTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py b/lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py
index dfbd4b756f92f..894fb240ab837 100644
--- a/lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py
+++ b/lldb/test/API/commands/log/invalid-args/TestInvalidArgsLog.py
@@ -4,8 +4,6 @@
 
 class InvalidArgsLogTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_enable_empty(self):
         self.expect("log enable", error=True,

diff  --git a/lldb/test/API/commands/memory/read/TestMemoryRead.py b/lldb/test/API/commands/memory/read/TestMemoryRead.py
index a1b88393c8cf1..aa3c0f8e91531 100644
--- a/lldb/test/API/commands/memory/read/TestMemoryRead.py
+++ b/lldb/test/API/commands/memory/read/TestMemoryRead.py
@@ -10,8 +10,6 @@
 
 
 class MemoryReadTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def build_run_stop(self):

diff  --git a/lldb/test/API/commands/memory/write/TestMemoryWrite.py b/lldb/test/API/commands/memory/write/TestMemoryWrite.py
index 852edf95079f7..26e878173bddf 100644
--- a/lldb/test/API/commands/memory/write/TestMemoryWrite.py
+++ b/lldb/test/API/commands/memory/write/TestMemoryWrite.py
@@ -11,8 +11,6 @@
 
 class MemoryWriteTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/platform/basic/TestPlatformCommand.py b/lldb/test/API/commands/platform/basic/TestPlatformCommand.py
index bc4825ae428cc..d21a79baf5458 100644
--- a/lldb/test/API/commands/platform/basic/TestPlatformCommand.py
+++ b/lldb/test/API/commands/platform/basic/TestPlatformCommand.py
@@ -11,8 +11,6 @@
 
 
 class PlatformCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @no_debug_info_test

diff  --git a/lldb/test/API/commands/platform/basic/TestPlatformPython.py b/lldb/test/API/commands/platform/basic/TestPlatformPython.py
index 46f0d0c9503bb..b7a570a387820 100644
--- a/lldb/test/API/commands/platform/basic/TestPlatformPython.py
+++ b/lldb/test/API/commands/platform/basic/TestPlatformPython.py
@@ -12,8 +12,6 @@
 
 class PlatformPythonTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @no_debug_info_test
     def test_platform_list(self):

diff  --git a/lldb/test/API/commands/platform/connect/TestPlatformConnect.py b/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
index a7a3f3adf803a..cc955f5ff9bd2 100644
--- a/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
+++ b/lldb/test/API/commands/platform/connect/TestPlatformConnect.py
@@ -6,7 +6,6 @@
 from lldbsuite.test import lldbutil
 
 class TestPlatformProcessConnect(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/commands/platform/file/close/TestPlatformFileClose.py b/lldb/test/API/commands/platform/file/close/TestPlatformFileClose.py
index f440b674517e9..056b4e378a18b 100644
--- a/lldb/test/API/commands/platform/file/close/TestPlatformFileClose.py
+++ b/lldb/test/API/commands/platform/file/close/TestPlatformFileClose.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_file_close_invalid_arg(self):
         self.expect("platform file close y", error=True,

diff  --git a/lldb/test/API/commands/platform/file/read/TestPlatformFileRead.py b/lldb/test/API/commands/platform/file/read/TestPlatformFileRead.py
index a1f963a0e065d..e5bffe662d792 100644
--- a/lldb/test/API/commands/platform/file/read/TestPlatformFileRead.py
+++ b/lldb/test/API/commands/platform/file/read/TestPlatformFileRead.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_file_close_invalid_arg(self):
         self.expect("platform file read y", error=True,

diff  --git a/lldb/test/API/commands/platform/process/list/TestProcessList.py b/lldb/test/API/commands/platform/process/list/TestProcessList.py
index 5d83512a73a57..5daf5dc49b52a 100644
--- a/lldb/test/API/commands/platform/process/list/TestProcessList.py
+++ b/lldb/test/API/commands/platform/process/list/TestProcessList.py
@@ -13,8 +13,6 @@
 
 class ProcessListTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows  # https://bugs.llvm.org/show_bug.cgi?id=43702

diff  --git a/lldb/test/API/commands/platform/sdk/TestPlatformSDK.py b/lldb/test/API/commands/platform/sdk/TestPlatformSDK.py
index 06c780dc6a5e3..93c4a7b724ab4 100644
--- a/lldb/test/API/commands/platform/sdk/TestPlatformSDK.py
+++ b/lldb/test/API/commands/platform/sdk/TestPlatformSDK.py
@@ -13,8 +13,6 @@
 
 
 class PlatformSDKTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # The port used by debugserver.

diff  --git a/lldb/test/API/commands/process/attach-resume/TestAttachResume.py b/lldb/test/API/commands/process/attach-resume/TestAttachResume.py
index 11d9ab26fa248..7858fa234dc8a 100644
--- a/lldb/test/API/commands/process/attach-resume/TestAttachResume.py
+++ b/lldb/test/API/commands/process/attach-resume/TestAttachResume.py
@@ -13,8 +13,6 @@
 
 
 class AttachResumeTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/commands/process/attach/TestProcessAttach.py b/lldb/test/API/commands/process/attach/TestProcessAttach.py
index b2d6878b13c0f..546730fb70ac0 100644
--- a/lldb/test/API/commands/process/attach/TestProcessAttach.py
+++ b/lldb/test/API/commands/process/attach/TestProcessAttach.py
@@ -16,8 +16,6 @@
 
 class ProcessAttachTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py b/lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py
index 1072529e31141..a958ec3968cbf 100644
--- a/lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py
+++ b/lldb/test/API/commands/process/attach/attach_denied/TestAttachDenied.py
@@ -14,8 +14,6 @@
 
 
 class AttachDeniedTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows

diff  --git a/lldb/test/API/commands/process/handle/TestProcessHandle.py b/lldb/test/API/commands/process/handle/TestProcessHandle.py
index e026d4b74a35b..14e118bf87811 100644
--- a/lldb/test/API/commands/process/handle/TestProcessHandle.py
+++ b/lldb/test/API/commands/process/handle/TestProcessHandle.py
@@ -5,8 +5,6 @@
 
 class TestProcessHandle(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfWindows
     def test_process_handle(self):

diff  --git a/lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py b/lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
index 956070fd509af..f8733799144d5 100644
--- a/lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/test/API/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
@@ -11,8 +11,6 @@
 
 
 class LaunchWithShellExpandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(

diff  --git a/lldb/test/API/commands/process/launch/TestProcessLaunch.py b/lldb/test/API/commands/process/launch/TestProcessLaunch.py
index 3f0791a2bd06b..e03cc6e1456d5 100644
--- a/lldb/test/API/commands/process/launch/TestProcessLaunch.py
+++ b/lldb/test/API/commands/process/launch/TestProcessLaunch.py
@@ -15,8 +15,6 @@
 
 
 class ProcessLaunchTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/process/signal/TestProcessSignal.py b/lldb/test/API/commands/process/signal/TestProcessSignal.py
index 389732385c5f1..17321dcef63b5 100644
--- a/lldb/test/API/commands/process/signal/TestProcessSignal.py
+++ b/lldb/test/API/commands/process/signal/TestProcessSignal.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.build()

diff  --git a/lldb/test/API/commands/quit/TestQuit.py b/lldb/test/API/commands/quit/TestQuit.py
index d4dbd16869a90..adebeb683d96a 100644
--- a/lldb/test/API/commands/quit/TestQuit.py
+++ b/lldb/test/API/commands/quit/TestQuit.py
@@ -11,8 +11,6 @@
 
 class QuitCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_quit_exit_code_disallow(self):
         self.ci.AllowExitCodeOnQuit(False)

diff  --git a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py b/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
index ecaefb0e657e8..423e52ba44aef 100644
--- a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
+++ b/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py
@@ -64,8 +64,6 @@ def sve_regs_read_dynamic(self, sve_registers):
         self.runCmd('register write ffr ' + "'" + p_regs_value + "'")
         self.expect('register read ffr', substrs=[p_regs_value])
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIf(archs=no_match(["aarch64"]))
     @skipIf(oslist=no_match(['linux']))

diff  --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py b/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
index 4d9cb686818e4..5fb24fdafd517 100644
--- a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
+++ b/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_dynamic_resize/TestSVEThreadedDynamic.py
@@ -49,8 +49,6 @@ def check_sve_registers(self, vg_test_value):
 
         self.expect("register read ffr", substrs=[p_regs_value])
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIf(archs=no_match(["aarch64"]))
     @skipIf(oslist=no_match(['linux']))

diff  --git a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py b/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
index dd2277b922739..2330efc4620de 100644
--- a/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
+++ b/lldb/test/API/commands/register/register/aarch64_sve_registers/rw_access_static_config/TestSVERegisters.py
@@ -62,8 +62,6 @@ def check_sve_regs_read_after_write(self, z_reg_size):
 
         self.expect("register read " + 'ffr', substrs=[p_regs_value])
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIf(archs=no_match(["aarch64"]))
     @skipIf(oslist=no_match(['linux']))

diff  --git a/lldb/test/API/commands/register/register/register_command/TestRegisters.py b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
index 0fd90dc973d2b..c3b26da3959d6 100644
--- a/lldb/test/API/commands/register/register/register_command/TestRegisters.py
+++ b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
@@ -14,8 +14,6 @@
 
 
 class RegisterCommandsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py b/lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
index 74db2fc77567c..03626c54a2c60 100644
--- a/lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
+++ b/lldb/test/API/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
@@ -4,8 +4,6 @@
 
 class ReproducerTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_reproducer_generate_invalid_invocation(self):
         self.expect("reproducer generate f", error=True,

diff  --git a/lldb/test/API/commands/session/history/TestSessionHistory.py b/lldb/test/API/commands/session/history/TestSessionHistory.py
index 56e7336781fa3..3b49cc69523fe 100644
--- a/lldb/test/API/commands/session/history/TestSessionHistory.py
+++ b/lldb/test/API/commands/session/history/TestSessionHistory.py
@@ -12,8 +12,6 @@
 
 class SessionHistoryTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_history(self):
         self.runCmd('session history --clear', inHistory=False)

diff  --git a/lldb/test/API/commands/session/save/TestSessionSave.py b/lldb/test/API/commands/session/save/TestSessionSave.py
index 04dddc5cab55e..5474cb354dae0 100644
--- a/lldb/test/API/commands/session/save/TestSessionSave.py
+++ b/lldb/test/API/commands/session/save/TestSessionSave.py
@@ -12,8 +12,6 @@
 
 class SessionSaveTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def raw_transcript_builder(self, cmd, res):
         raw = "(lldb) " + cmd + "\n"
         if res.GetOutputSize():

diff  --git a/lldb/test/API/commands/settings/TestSettings.py b/lldb/test/API/commands/settings/TestSettings.py
index 9ba5a5dfbcab2..0ea1e7b95e3d9 100644
--- a/lldb/test/API/commands/settings/TestSettings.py
+++ b/lldb/test/API/commands/settings/TestSettings.py
@@ -13,8 +13,6 @@
 
 
 class SettingsCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_apropos_should_also_search_settings_description(self):

diff  --git a/lldb/test/API/commands/settings/quoting/TestQuoting.py b/lldb/test/API/commands/settings/quoting/TestQuoting.py
index b070d26664cf5..1caf6dd5c5e90 100644
--- a/lldb/test/API/commands/settings/quoting/TestQuoting.py
+++ b/lldb/test/API/commands/settings/quoting/TestQuoting.py
@@ -9,8 +9,6 @@
 
 
 class SettingsCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     output_file_name = "output.txt"
 
     @classmethod

diff  --git a/lldb/test/API/commands/settings/use_source_cache/TestUseSourceCache.py b/lldb/test/API/commands/settings/use_source_cache/TestUseSourceCache.py
index bd26868604678..b6b279aaec65a 100644
--- a/lldb/test/API/commands/settings/use_source_cache/TestUseSourceCache.py
+++ b/lldb/test/API/commands/settings/use_source_cache/TestUseSourceCache.py
@@ -10,8 +10,6 @@
 from shutil import copy
 
 class SettingsUseSourceCacheTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_set_use_source_cache_false(self):

diff  --git a/lldb/test/API/commands/statistics/basic/TestStats.py b/lldb/test/API/commands/statistics/basic/TestStats.py
index 77df1cda6358e..471872a13869e 100644
--- a/lldb/test/API/commands/statistics/basic/TestStats.py
+++ b/lldb/test/API/commands/statistics/basic/TestStats.py
@@ -7,8 +7,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_enable_disable(self):

diff  --git a/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py b/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
index 2bc9a05c5e1b9..78d02358df78d 100644
--- a/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
+++ b/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
@@ -12,7 +12,6 @@
 
 
 class TestAutoInstallMainExecutable(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/commands/target/basic/TestTargetCommand.py b/lldb/test/API/commands/target/basic/TestTargetCommand.py
index 0f153fcdbfed8..91adc98d3c39b 100644
--- a/lldb/test/API/commands/target/basic/TestTargetCommand.py
+++ b/lldb/test/API/commands/target/basic/TestTargetCommand.py
@@ -14,8 +14,6 @@
 
 class targetCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py b/lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py
index 4e6f3ffba3638..ed00bbcf11a57 100644
--- a/lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py
+++ b/lldb/test/API/commands/target/create-deps/TestTargetCreateDeps.py
@@ -12,8 +12,6 @@
 @skipIfWindows # Windows deals 
diff erently with shared libs.
 class TargetDependentsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py b/lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py
index 622a813ed41e9..f7f3c0e0f79e6 100644
--- a/lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py
+++ b/lldb/test/API/commands/target/create-no-such-arch/TestNoSuchArch.py
@@ -9,8 +9,6 @@
 
 
 class NoSuchArchTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py b/lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py
index 9f95a11f38758..5f36c19570084 100644
--- a/lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py
+++ b/lldb/test/API/commands/target/dump-symtab-demangle/TestDumpSymtabDemangle.py
@@ -8,8 +8,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         src_dir = self.getSourceDir()

diff  --git a/lldb/test/API/commands/target/dump/TestTargetDumpTypeSystem.py b/lldb/test/API/commands/target/dump/TestTargetDumpTypeSystem.py
index c9a20b8aa1e41..e1a7caf0249ed 100644
--- a/lldb/test/API/commands/target/dump/TestTargetDumpTypeSystem.py
+++ b/lldb/test/API/commands/target/dump/TestTargetDumpTypeSystem.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_dumping(self):
         """ Tests dumping an empty and non-empty scratch AST. """

diff  --git a/lldb/test/API/commands/target/modules/search-paths/insert/TestTargetModulesSearchpathsInsert.py b/lldb/test/API/commands/target/modules/search-paths/insert/TestTargetModulesSearchpathsInsert.py
index 169b32b974420..a68da5f049eff 100644
--- a/lldb/test/API/commands/target/modules/search-paths/insert/TestTargetModulesSearchpathsInsert.py
+++ b/lldb/test/API/commands/target/modules/search-paths/insert/TestTargetModulesSearchpathsInsert.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.build()

diff  --git a/lldb/test/API/commands/target/select/TestTargetSelect.py b/lldb/test/API/commands/target/select/TestTargetSelect.py
index e53745ee21637..4336e50130698 100644
--- a/lldb/test/API/commands/target/select/TestTargetSelect.py
+++ b/lldb/test/API/commands/target/select/TestTargetSelect.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.expect("target select -1", error=True,

diff  --git a/lldb/test/API/commands/target/stop-hook/delete/TestTargetStopHookDelete.py b/lldb/test/API/commands/target/stop-hook/delete/TestTargetStopHookDelete.py
index 35b718b93f617..48f81b69fe5a7 100644
--- a/lldb/test/API/commands/target/stop-hook/delete/TestTargetStopHookDelete.py
+++ b/lldb/test/API/commands/target/stop-hook/delete/TestTargetStopHookDelete.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.expect("target stop-hook delete -1", error=True,

diff  --git a/lldb/test/API/commands/target/stop-hook/disable/TestTargetStopHookDisable.py b/lldb/test/API/commands/target/stop-hook/disable/TestTargetStopHookDisable.py
index 5e665a87c344d..2cb89635fb99d 100644
--- a/lldb/test/API/commands/target/stop-hook/disable/TestTargetStopHookDisable.py
+++ b/lldb/test/API/commands/target/stop-hook/disable/TestTargetStopHookDisable.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.expect("target stop-hook disable -1", error=True,

diff  --git a/lldb/test/API/commands/target/stop-hook/enable/TestTargetStopHookEnable.py b/lldb/test/API/commands/target/stop-hook/enable/TestTargetStopHookEnable.py
index 5c1dcf4b2c00a..571040eda0269 100644
--- a/lldb/test/API/commands/target/stop-hook/enable/TestTargetStopHookEnable.py
+++ b/lldb/test/API/commands/target/stop-hook/enable/TestTargetStopHookEnable.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_arg(self):
         self.expect("target stop-hook enable -1", error=True,

diff  --git a/lldb/test/API/commands/target/stop-hooks/TestStopHookScripted.py b/lldb/test/API/commands/target/stop-hooks/TestStopHookScripted.py
index 017aee982207b..a2c9397f1a79b 100644
--- a/lldb/test/API/commands/target/stop-hooks/TestStopHookScripted.py
+++ b/lldb/test/API/commands/target/stop-hooks/TestStopHookScripted.py
@@ -11,8 +11,6 @@
 
 class TestStopHooks(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/commands/target/stop-hooks/TestStopHooks.py b/lldb/test/API/commands/target/stop-hooks/TestStopHooks.py
index b9a6e5348614e..38bb17423350b 100644
--- a/lldb/test/API/commands/target/stop-hooks/TestStopHooks.py
+++ b/lldb/test/API/commands/target/stop-hooks/TestStopHooks.py
@@ -11,8 +11,6 @@
 
 class TestStopHooks(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/commands/thread/backtrace/TestThreadBacktraceRepeat.py b/lldb/test/API/commands/thread/backtrace/TestThreadBacktraceRepeat.py
index b1a1c4fb007a2..a9546da4501cf 100644
--- a/lldb/test/API/commands/thread/backtrace/TestThreadBacktraceRepeat.py
+++ b/lldb/test/API/commands/thread/backtrace/TestThreadBacktraceRepeat.py
@@ -11,8 +11,6 @@
 
 
 class TestThreadBacktracePage(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_thread_backtrace_one_thread(self):

diff  --git a/lldb/test/API/commands/thread/select/TestThreadSelect.py b/lldb/test/API/commands/thread/select/TestThreadSelect.py
index 4650fae518ddd..ff8682699ba99 100644
--- a/lldb/test/API/commands/thread/select/TestThreadSelect.py
+++ b/lldb/test/API/commands/thread/select/TestThreadSelect.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_invalid_arg(self):
         self.build()
 

diff  --git a/lldb/test/API/commands/trace/TestTraceDumpInfo.py b/lldb/test/API/commands/trace/TestTraceDumpInfo.py
index efe5fb5e17d4b..f54d5e3907bd8 100644
--- a/lldb/test/API/commands/trace/TestTraceDumpInfo.py
+++ b/lldb/test/API/commands/trace/TestTraceDumpInfo.py
@@ -5,7 +5,6 @@
 from lldbsuite.test.decorators import *
 
 class TestTraceDumpInfo(TraceIntelPTTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def testErrorMessages(self):
         # We first check the output when there are no targets

diff  --git a/lldb/test/API/commands/trace/TestTraceDumpInstructions.py b/lldb/test/API/commands/trace/TestTraceDumpInstructions.py
index bbcee695a619c..7bf3c1006ddbc 100644
--- a/lldb/test/API/commands/trace/TestTraceDumpInstructions.py
+++ b/lldb/test/API/commands/trace/TestTraceDumpInstructions.py
@@ -6,8 +6,6 @@
 
 class TestTraceDumpInstructions(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def testErrorMessages(self):
         # We first check the output when there are no targets
         self.expect("thread trace dump instructions",

diff  --git a/lldb/test/API/commands/trace/TestTraceEvents.py b/lldb/test/API/commands/trace/TestTraceEvents.py
index d8c8e6eea8ca4..472805fdfb694 100644
--- a/lldb/test/API/commands/trace/TestTraceEvents.py
+++ b/lldb/test/API/commands/trace/TestTraceEvents.py
@@ -6,8 +6,6 @@
 
 class TestTraceEvents(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @testSBAPIAndCommands
     def testPauseEvents(self):
       '''

diff  --git a/lldb/test/API/commands/trace/TestTraceExport.py b/lldb/test/API/commands/trace/TestTraceExport.py
index 7126424d5a2d9..5fdb48e7903ea 100644
--- a/lldb/test/API/commands/trace/TestTraceExport.py
+++ b/lldb/test/API/commands/trace/TestTraceExport.py
@@ -9,8 +9,6 @@
 
 class TestTraceExport(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def testErrorMessages(self):
         ctf_test_file = self.getBuildArtifact("ctf-test.json")
         # We first check the output when there are no targets

diff  --git a/lldb/test/API/commands/trace/TestTraceLoad.py b/lldb/test/API/commands/trace/TestTraceLoad.py
index 3dfcc88fa777d..e5746989ba1c0 100644
--- a/lldb/test/API/commands/trace/TestTraceLoad.py
+++ b/lldb/test/API/commands/trace/TestTraceLoad.py
@@ -5,8 +5,6 @@
 from lldbsuite.test.decorators import *
 
 class TestTraceLoad(TraceIntelPTTestCaseBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def testLoadMultiCoreTrace(self):

diff  --git a/lldb/test/API/commands/trace/TestTraceSave.py b/lldb/test/API/commands/trace/TestTraceSave.py
index f7752abee44e0..b5212ef1b13f6 100644
--- a/lldb/test/API/commands/trace/TestTraceSave.py
+++ b/lldb/test/API/commands/trace/TestTraceSave.py
@@ -11,7 +11,6 @@ def find(predicate, seq):
       return item
 
 class TestTraceSave(TraceIntelPTTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def testErrorMessages(self):
         # We first check the output when there are no targets

diff  --git a/lldb/test/API/commands/trace/TestTraceSchema.py b/lldb/test/API/commands/trace/TestTraceSchema.py
index 368fd6a7e98bd..b26b8f5146713 100644
--- a/lldb/test/API/commands/trace/TestTraceSchema.py
+++ b/lldb/test/API/commands/trace/TestTraceSchema.py
@@ -6,8 +6,6 @@
 
 class TestTraceLoad(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def testSchema(self):
         self.expect("trace schema intel-pt", substrs=["triple", "threads", "iptTrace"])
 

diff  --git a/lldb/test/API/commands/trace/TestTraceStartStop.py b/lldb/test/API/commands/trace/TestTraceStartStop.py
index f4b5c0950acd2..0f7c924ea8ee9 100644
--- a/lldb/test/API/commands/trace/TestTraceStartStop.py
+++ b/lldb/test/API/commands/trace/TestTraceStartStop.py
@@ -6,8 +6,6 @@
 
 class TestTraceStartStop(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def expectGenericHelpMessageForStartCommand(self):
         self.expect("help thread trace start",
             substrs=["Syntax: thread trace start [<trace-options>]"])

diff  --git a/lldb/test/API/commands/trace/TestTraceTSC.py b/lldb/test/API/commands/trace/TestTraceTSC.py
index 4aefe0feacbe0..a50363e44f640 100644
--- a/lldb/test/API/commands/trace/TestTraceTSC.py
+++ b/lldb/test/API/commands/trace/TestTraceTSC.py
@@ -6,8 +6,6 @@
 
 class TestTraceTimestampCounters(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @testSBAPIAndCommands
     @skipIf(oslist=no_match(['linux']), archs=no_match(['i386', 'x86_64']))
     def testTscPerThread(self):

diff  --git a/lldb/test/API/commands/trace/multiple-threads/TestTraceStartStopMultipleThreads.py b/lldb/test/API/commands/trace/multiple-threads/TestTraceStartStopMultipleThreads.py
index 7c90c9a1ca50f..3276a6e3bd9cd 100644
--- a/lldb/test/API/commands/trace/multiple-threads/TestTraceStartStopMultipleThreads.py
+++ b/lldb/test/API/commands/trace/multiple-threads/TestTraceStartStopMultipleThreads.py
@@ -7,8 +7,6 @@
 
 class TestTraceStartStopMultipleThreads(TraceIntelPTTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(oslist=no_match(['linux']), archs=no_match(['i386', 'x86_64']))
     @testSBAPIAndCommands
     def testStartMultipleLiveThreads(self):

diff  --git a/lldb/test/API/commands/version/TestVersion.py b/lldb/test/API/commands/version/TestVersion.py
index 48b46f65a787d..c6e91e38c68ea 100644
--- a/lldb/test/API/commands/version/TestVersion.py
+++ b/lldb/test/API/commands/version/TestVersion.py
@@ -4,8 +4,6 @@
 
 class VersionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_version(self):
         # Should work even when people patch the output,

diff  --git a/lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py b/lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
index 2859df3c47bd0..660b7a398e2fd 100644
--- a/lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/test/API/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
@@ -12,8 +12,6 @@
 
 
 class HelloWatchLocationTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
index d51565b2b8474..ac1a6dd65eaa5 100644
--- a/lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/test/API/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -11,8 +11,6 @@
 
 
 class HelloWatchpointTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
index 843a2ac747727..edb7a6b38c414 100644
--- a/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
+++ b/lldb/test/API/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
@@ -14,8 +14,6 @@
 class WatchpointSlotsTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py b/lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py
index 86f896dbb2e27..9267637314013 100644
--- a/lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py
+++ b/lldb/test/API/commands/watchpoints/multiple_hits/TestMultipleHits.py
@@ -11,8 +11,6 @@
 
 
 class MultipleHitsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(bugnumber="llvm.org/pr30758", oslist=["linux"], archs=["arm", "aarch64", "powerpc64le"])

diff  --git a/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
index 996353d927ca7..e66a1f3e99e00 100644
--- a/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
@@ -13,8 +13,6 @@
 
 
 class WatchpointForMultipleThreadsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
     main_spec = lldb.SBFileSpec("main.cpp", False)
 

diff  --git a/lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
index 14871a99b68d3..775d80d1713fe 100644
--- a/lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/test/API/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -9,8 +9,6 @@
 
 
 class TestStepOverWatchpoint(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(

diff  --git a/lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index eee89134a13b4..fadd3f2313f01 100644
--- a/lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@@ -12,8 +12,6 @@
 
 
 class WatchedVariableHitWhenInScopeTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # This test depends on not tracking watchpoint expression hits if we have

diff  --git a/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py b/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py
index 34fe68aad150f..a43dde2d7c6aa 100644
--- a/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py
+++ b/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py
@@ -8,8 +8,6 @@
 from lldbsuite.test import lldbutil
 
 class TestWatchTaggedAddresses(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
index 50f78812935e4..e9ea7d9c62ccc 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
@@ -11,8 +11,6 @@
 
 
 class WatchpointCommandsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index 432bd0d0b2bab..584ed49f8915c 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -11,8 +11,6 @@
 
 
 class WatchpointLLDBCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
index c99c44d098d5c..b6e11d661ded3 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -12,8 +12,6 @@
 
 
 class WatchpointPythonCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index f53da3a521932..b3b0e102e6c3b 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -11,8 +11,6 @@
 
 
 class WatchpointConditionCmdTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py b/lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py
index f290c583fd553..a940e005a2222 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_count/TestWatchpointCount.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestWatchpointCount(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py b/lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
index 9ba3cf362d863..e582d5467241a 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
@@ -9,7 +9,6 @@
 
 
 class TestWatchpointSetEnable(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_disable_works (self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py b/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
index 4698716d074b9..1d6266a6b81d4 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
@@ -10,8 +10,6 @@
 
 
 class TestWatchpointEvents (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
index 81b44c02744de..8c4c0bfac9cec 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
@@ -11,8 +11,6 @@
 
 
 class TestValueOfVectorVariableTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_value_of_vector_variable_using_watchpoint_set(self):

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index 23c4b3062662c..aceb8f2bc4385 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -11,8 +11,6 @@
 
 
 class WatchLocationUsingWatchpointSetTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # on arm64 targets, lldb has incorrect hit-count / ignore-counts

diff  --git a/lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py b/lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
index e6634f1e4a391..785622236af84 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
@@ -15,8 +15,6 @@
 class WatchpointSizeTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/driver/batch_mode/TestBatchMode.py b/lldb/test/API/driver/batch_mode/TestBatchMode.py
index d9d75f71de21a..6626de2cacdc5 100644
--- a/lldb/test/API/driver/batch_mode/TestBatchMode.py
+++ b/lldb/test/API/driver/batch_mode/TestBatchMode.py
@@ -12,8 +12,6 @@
 
 
 class DriverBatchModeTest(PExpectTest):
-
-    mydir = TestBase.compute_mydir(__file__)
     source = 'main.c'
 
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"]) # Randomly fails on buildbot

diff  --git a/lldb/test/API/driver/job_control/TestJobControl.py b/lldb/test/API/driver/job_control/TestJobControl.py
index 946938273c101..de50c2030f703 100644
--- a/lldb/test/API/driver/job_control/TestJobControl.py
+++ b/lldb/test/API/driver/job_control/TestJobControl.py
@@ -8,8 +8,6 @@
 
 
 class JobControlTest(PExpectTest):
-
-    mydir = TestBase.compute_mydir(__file__)
     
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
     def test_job_control(self):

diff  --git a/lldb/test/API/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/API/functionalities/abbreviation/TestAbbreviations.py
index 4a129bbcd3eb8..7653380f78a0a 100644
--- a/lldb/test/API/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/test/API/functionalities/abbreviation/TestAbbreviations.py
@@ -10,8 +10,6 @@
 
 class AbbreviationsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_command_abbreviations_and_aliases(self):
         command_interpreter = self.dbg.GetCommandInterpreter()

diff  --git a/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py
index 9e4b3bb9d2d5d..c89ba29c06f23 100644
--- a/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py
@@ -13,8 +13,6 @@
 
 class CommonShortSpellingsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_abbrevs2(self):
         command_interpreter = self.dbg.GetCommandInterpreter()

diff  --git a/lldb/test/API/functionalities/archives/TestBSDArchives.py b/lldb/test/API/functionalities/archives/TestBSDArchives.py
index bb4b469cf436a..c79e618db58b5 100644
--- a/lldb/test/API/functionalities/archives/TestBSDArchives.py
+++ b/lldb/test/API/functionalities/archives/TestBSDArchives.py
@@ -10,8 +10,6 @@
 
 class BSDArchivesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/asan/TestMemoryHistory.py b/lldb/test/API/functionalities/asan/TestMemoryHistory.py
index 185b3ecba5fa2..a7ddd386cff57 100644
--- a/lldb/test/API/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/test/API/functionalities/asan/TestMemoryHistory.py
@@ -13,8 +13,6 @@
 
 class AsanTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @expectedFailureNetBSD
     @skipUnlessAddressSanitizer

diff  --git a/lldb/test/API/functionalities/asan/TestReportData.py b/lldb/test/API/functionalities/asan/TestReportData.py
index de51fb1724c84..2ffeb1d708d60 100644
--- a/lldb/test/API/functionalities/asan/TestReportData.py
+++ b/lldb/test/API/functionalities/asan/TestReportData.py
@@ -13,8 +13,6 @@
 
 class AsanTestReportDataCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @expectedFailureNetBSD
     @skipUnlessAddressSanitizer

diff  --git a/lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py
index 36570fce7d6d2..018892f82fa48 100644
--- a/lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py
+++ b/lldb/test/API/functionalities/avoids-fd-leak/TestFdLeak.py
@@ -14,8 +14,6 @@ class AvoidsFdLeakTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # The check for descriptor leakage needs to be implemented 
diff erently
     # here.
     @skipIfWindows

diff  --git a/lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py
index fdef89c6e056e..c2367d7ef8161 100644
--- a/lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py
+++ b/lldb/test/API/functionalities/backticks/TestBackticksWithoutATarget.py
@@ -12,8 +12,6 @@
 
 class BackticksWithNoTargetTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_backticks_no_target(self):
         """A simple test of backticks without a target."""

diff  --git a/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
index 76842671571b2..e2369be9ff94b 100644
--- a/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
@@ -11,8 +11,6 @@
 
 class AddressBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_address_breakpoints(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
index cd33ba86eb369..49ffbd33b8912 100644
--- a/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
@@ -11,8 +11,6 @@
 
 class BadAddressBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_bad_address_breakpoints(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py b/lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
index 62807b8937e9d..5100a9b5e2d5c 100644
--- a/lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
+++ b/lldb/test/API/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
@@ -11,8 +11,6 @@
 
 class BreakpointAutoContinue(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_breakpoint_auto_continue(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/TestBreakInLoadedDylib.py b/lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/TestBreakInLoadedDylib.py
index e203511cd49c7..336b4103bd41d 100644
--- a/lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/TestBreakInLoadedDylib.py
+++ b/lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/TestBreakInLoadedDylib.py
@@ -6,8 +6,6 @@
 class TestBreakInLoadedDylib(TestBase):
     """ Test that we can set a source regex breakpoint that will take in
     a dlopened library that hasn't loaded when we set the breakpoint."""
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
index fa32a4de4b0e0..46a11e0b8d23b 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
@@ -12,8 +12,6 @@
 
 class BreakpointByLineAndColumnTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def testBreakpointSpecWithLine(self):
         self.build()
         target = self.createTestTarget()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
index a419e5d650d0a..576a47601b222 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
@@ -11,8 +11,6 @@
 
 class BreakpointByLineAndColumnTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     ## Skip gcc version less 7.1 since it doesn't support -gcolumn-info
     @skipIf(compiler="gcc", compiler_version=['<', '7.1'])
     def testBreakpointByLineAndColumn(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py
index d504c984855ce..c35691b6f01bb 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_callback_command_source/TestBreakpointCallbackCommandSource.py
@@ -11,8 +11,6 @@
 
 
 class BreakpointCallbackCommandSource(PExpectTest):
-
-    mydir = TestBase.compute_mydir(__file__)
     file_to_source = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'source.lldb')
 
     # PExpect uses many timeouts internally and doesn't play well

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index 7a47062de9858..5bd7b43130ebc 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -14,7 +14,6 @@
 class BreakpointCommandTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
     def test_breakpoint_command_sequence(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
index f9c9554c63c6a..fa9197b0fa973 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
@@ -13,8 +13,6 @@
 
 
 class PythonBreakpointCommandSettingTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index ed462653d24de..aee32e8386c30 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
@@ -12,8 +12,6 @@
 
 class RegexpBreakCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test _regexp-break command."""
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 00da4a8c97f92..59bf391e0b51a 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -10,8 +10,6 @@
 
 class BreakpointConditionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_breakpoint_condition_and_run_command(self):
         """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
index 3c635b253604f..3c8dd117f94c2 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
@@ -13,8 +13,6 @@ class BreakpointHitCountTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     def test_breakpoint_location_hit_count(self):
         """Use Python APIs to check breakpoint hit count."""

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 8924db076a659..cfe3d4476a2eb 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -11,8 +11,6 @@
 
 class BreakpointIDTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
 

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index b217538835a60..a61f5c3f5aa15 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
@@ -12,8 +12,6 @@
 
 class BreakpointIgnoreCountTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # This test will hang on windows llvm.org/pr21753
     def test_with_run_command(self):
         """Exercise breakpoint ignore count with 'breakpoint set -i <count>'."""

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
index fa0a20f6938e6..b95ea8336504e 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
@@ -14,8 +14,6 @@
 
 class AvoidBreakpointInDelaySlotAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(archs=no_match(re.compile('mips*')))
     def test(self):
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py b/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
index 87b1b93e3e957..8815a37cff52a 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
@@ -12,8 +12,6 @@
 
 class TestBreakpointLanguage(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_location_file(self, bp, loc, test_name):
         bp_loc = bp.GetLocationAtIndex(loc)
         addr = bp_loc.GetAddress()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 1fc96b3fb04d0..85c55a44d7226 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -12,8 +12,6 @@
 
 class BreakpointLocationsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
     def test_enable(self):
         """Test breakpoint enable/disable for a breakpoint ID with multiple locations."""

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py b/lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
index aee8d05ec2410..03ede5a64bd0f 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
@@ -12,8 +12,6 @@
 
 
 class BreakpointNames(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
index 30124f8335d73..8650712642e09 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
@@ -11,8 +11,6 @@
 
 class TestBreakpointOnOverload(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_breakpoint(self, name):
         bkpt = self.target.BreakpointCreateByName(name)
         self.assertEqual(bkpt.num_locations, 1, "Got one location")

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index 0419b4df5dd11..bb4f33ce9291d 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -11,8 +11,6 @@
 
 class BreakpointOptionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test breakpoint command for 
diff erent options."""
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
index aafa43fc5bb69..36eeb341335c7 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
@@ -8,8 +8,6 @@
 
 
 class BreakpointSetRestart(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     BREAKPOINT_TEXT = 'Set a breakpoint here'
 
     @skipIfNetBSD

diff  --git a/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
index a5605aebe192b..aada4d45b4a06 100644
--- a/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
+++ b/lldb/test/API/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
@@ -17,8 +17,6 @@
 
 class CompDirSymLinkTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
index 0bab92fd3705b..6476aaeb3fd49 100644
--- a/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
@@ -13,8 +13,6 @@
 
 class ConsecutiveBreakpointsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def prepare_test(self):
         self.build()
 

diff  --git a/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index 8edd852cd8ece..d4da4dd9aeac8 100644
--- a/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -13,8 +13,6 @@
 
 class TestCPPBreakpointLocations(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
     def test(self):
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
index a6953019847a6..45afa130ff77a 100644
--- a/lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
@@ -11,8 +11,6 @@
 
 
 class TestCPPExceptionBreakpoint (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     my_var = 10
 
     @add_test_categories(['pyapi'])

diff  --git a/lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py b/lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py
index 9c02347d68ed8..3d8dcc9b0ac67 100644
--- a/lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py
+++ b/lldb/test/API/functionalities/breakpoint/debugbreak/TestDebugBreak.py
@@ -11,8 +11,6 @@
 
 class DebugBreakTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(archs=no_match(["i386", "i686", "x86_64"]))
     @no_debug_info_test
     def test_asm_int_3(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index e3f293a4a55c7..feb9bc9b20292 100644
--- a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
@@ -11,8 +11,6 @@
 
 class BreakpointInDummyTarget (TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test breakpoint set before we have a target. """
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py b/lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
index d5b8d34b64146..a85f8f9fa4add 100644
--- a/lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
+++ b/lldb/test/API/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
@@ -11,8 +11,6 @@
 
 
 class TestBreakpointInGlobalConstructors(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
index 01bf33693a23b..c39f486de3264 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
@@ -12,7 +12,6 @@
 from functionalities.breakpoint.hardware_breakpoints.base import *
 
 class HardwareBreakpointMultiThreadTestCase(HardwareBreakpointTestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def does_not_support_hw_breakpoints(self):
         return not super().supports_hw_breakpoints()

diff  --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py
index b27b53bc31d56..246d7d8d5a334 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/require_hw_breakpoints/TestRequireHWBreakpoints.py
@@ -11,7 +11,6 @@
 from functionalities.breakpoint.hardware_breakpoints.base import *
 
 class BreakpointLocationsTestCase(HardwareBreakpointTestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(oslist=["linux"], archs=["arm"])
     def supports_hw_breakpoints(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/write_memory_with_hw_breakpoint/TestWriteMemoryWithHWBreakpoint.py b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/write_memory_with_hw_breakpoint/TestWriteMemoryWithHWBreakpoint.py
index 842519be6f897..af2d4227aae30 100644
--- a/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/write_memory_with_hw_breakpoint/TestWriteMemoryWithHWBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/hardware_breakpoints/write_memory_with_hw_breakpoint/TestWriteMemoryWithHWBreakpoint.py
@@ -12,7 +12,6 @@
 from functionalities.breakpoint.hardware_breakpoints.base import *
 
 class WriteMemoryWithHWBreakpoint(HardwareBreakpointTestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def does_not_support_hw_breakpoints(self):
         return not super().supports_hw_breakpoints()

diff  --git a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index 506a9d22050a6..33a4fbc453ca5 100644
--- a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -13,8 +13,6 @@
 class InlinedBreakpointsTestCase(TestBase):
     """Bug fixed: rdar://problem/8464339"""
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
         self.build()

diff  --git a/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py b/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
index 05f77cf74e8bd..16d3f1c0e4adb 100644
--- a/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
+++ b/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
@@ -8,8 +8,6 @@
 
 
 class TestMoveNearest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py
index 3a6d663913801..fd693e7ce08e2 100644
--- a/lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/objc/TestObjCBreakpoints.py
@@ -15,8 +15,6 @@
 
 class TestObjCBreakpoints(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["objc"])
     def test_break(self):
         """Test setting Objective-C specific breakpoints (DWARF in .o files)."""

diff  --git a/lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
index 533054db53555..8a143bdf3817a 100644
--- a/lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
+++ b/lldb/test/API/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
@@ -11,8 +11,6 @@
 
 class TestScriptedResolver(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")

diff  --git a/lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
index 3493d40f7ad6a..8b09cbc31118d 100644
--- a/lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
+++ b/lldb/test/API/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
@@ -11,8 +11,6 @@
 
 
 class BreakpointSerialization(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])

diff  --git a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
index 3423c6d1ab4dc..7880d40ec2c91 100644
--- a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
@@ -12,8 +12,6 @@
 
 class TestSourceRegexBreakpoints(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_location(self):
         self.build()
         self.source_regex_locations()

diff  --git a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
index 90da4c02b46ad..0953f0b013e50 100644
--- a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
@@ -14,8 +14,6 @@
 
 class StepOverBreakpointsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/completion/TestCompletion.py b/lldb/test/API/functionalities/completion/TestCompletion.py
index 90e2ff2384e3c..f91049e6d5802 100644
--- a/lldb/test/API/functionalities/completion/TestCompletion.py
+++ b/lldb/test/API/functionalities/completion/TestCompletion.py
@@ -15,8 +15,6 @@
 
 class CommandLineCompletionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @classmethod

diff  --git a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
index cb3d32e8e0aca..9033d60a22f53 100644
--- a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
@@ -18,8 +18,6 @@
 
 class ConditionalBreakTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     def test_with_python(self):
         """Exercise some thread and frame APIs to break if c() is called by a()."""

diff  --git a/lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py b/lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py
index 1f2914ad6336e..9f956f3a91206 100644
--- a/lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py
+++ b/lldb/test/API/functionalities/data-formatter/array_typedef/TestArrayTypedef.py
@@ -4,8 +4,6 @@
 
 
 class ArrayTypedefTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_array_typedef(self):

diff  --git a/lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
index 95b3b5ce24dc5..53f339fdb0f3e 100644
--- a/lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
+++ b/lldb/test/API/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
@@ -12,8 +12,6 @@
 
 class DataFormatterBoolRefPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test_boolrefptr_with_run_command(self):
         """Test the formatters we use for BOOL& and BOOL* in Objective-C."""

diff  --git a/lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py b/lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py
index ee5c77280623a..10b626b1754d3 100644
--- a/lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py
+++ b/lldb/test/API/functionalities/data-formatter/builtin-formats/TestBuiltinFormats.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def getFormatted(self, format, expr):
         """
         Evaluates the expression and formats the result with the given format.

diff  --git a/lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py
index d7d5579b5fdbc..63a63a4932fa5 100644
--- a/lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py
+++ b/lldb/test/API/functionalities/data-formatter/compactvectors/TestCompactVectors.py
@@ -12,8 +12,6 @@
 
 class CompactVectorsFormattingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py b/lldb/test/API/functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py
index c05e9e9b06ba7..e60e6721c181b 100644
--- a/lldb/test/API/functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py
+++ b/lldb/test/API/functionalities/data-formatter/cstring-utf8-summary/TestCstringUnicode.py
@@ -6,8 +6,6 @@
 
 
 class CstringUnicodeTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_cstring_unicode(self):

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index f089038280e52..7d5d597203d46 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
@@ -11,8 +11,6 @@
 
 class AdvDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
index 881913b225b0f..cd049bc03e06d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
@@ -6,8 +6,6 @@
 
 class TestDataFormatterCaching(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """
         Test that hardcoded summary formatter matches aren't improperly cached.

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index 07f7a538b9279..6a4c50a012a38 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
@@ -10,8 +10,6 @@
 
 class CategoriesDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index e6b1d43599989..d4d6d249ebce3 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -12,8 +12,6 @@
 
 class CppDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index 3df6027fdb331..2ddb11a3b95b7 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
@@ -12,8 +12,6 @@
 
 class DataFormatterDisablingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index ca57442e4528b..5c8500e87933a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
@@ -11,8 +11,6 @@
 
 class EnumFormatTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index fe9a17e4e61fd..755535faebefc 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
@@ -12,8 +12,6 @@
 
 class GlobalsDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index 4e4c196c2986d..f49107795ecdc 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
@@ -11,8 +11,6 @@
 
 class NamedSummariesDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
index db7f823493f15..a1f393cf6df3e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/ObjCDataFormatterTestCase.py
@@ -12,8 +12,6 @@
 
 class ObjCDataFormatterTestCase(TestBase):
 
-   mydir = TestBase.compute_mydir(__file__)
-
    def appkit_tester_impl(self, commands, use_constant_classes):
       if use_constant_classes:
          self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py
index d08ab16401fce..0d1de6257982f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/cmtime/TestDataFormatterCMTime.py
@@ -8,8 +8,6 @@
 
 class CMTimeDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test_nsindexpath_with_run_command(self):
         """Test formatters for CMTime."""

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py
index 12461ab03de66..a404ad1612d38 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py
@@ -13,8 +13,6 @@
 
 class NSIndexPathDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def appkit_tester_impl(self, commands):
         self.build()
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
index 5b323f5614b21..64ba72cc39cbf 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
@@ -13,8 +13,6 @@
 
 class NSStringDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def appkit_tester_impl(self, commands):
         self.build()
         self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
index 4611e162adaa6..27daef81bda94 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
@@ -12,8 +12,6 @@
 
 class DataFormatterOneIsSingularTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test_one_is_singular_with_run_command(self):
         """Test that 1 item is not as reported as 1 items."""

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 84fcc427106c8..e1f10e4b10ee8 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
@@ -11,8 +11,6 @@
 
 class PtrToArrayDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that LLDB handles the clang typeclass Paren correctly."""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index c6805e450173c..e2cde963def7f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
@@ -13,8 +13,6 @@
 
 class PythonSynthDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
index 14387cde19447..35b619a369abd 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
@@ -11,8 +11,6 @@
 
 class ScriptDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index cafd51c209477..809a6edc2dd38 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
@@ -11,8 +11,6 @@
 
 class SkipSummaryDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["windows"],
         bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index 13953e40a377b..77757e05b585a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
@@ -12,8 +12,6 @@
 
 class SmartArrayDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
index 94efbc5c7cf60..9cf0aa4fd5ede 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
@@ -17,8 +17,6 @@
 
 class GenericBitsetDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         primes = [1]*1000

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
index a995d842d4d65..9aabd87f385ff 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
@@ -8,8 +8,6 @@
 
 class GenericDequeDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def findVariable(self, name):
         var = self.frame().FindVariable(name)
         self.assertTrue(var.IsValid())

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
index 8870c4ce79c71..8a677aa786a66 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
@@ -14,8 +14,6 @@
 
 class TestDataFormatterGenericForwardList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number('main.cpp', '// break here')

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
index 74269ef55e824..ef909e8b6ce9b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
@@ -14,8 +14,6 @@
 
 class GenericListDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
index 9786b6f70455f..0577e02ad059d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
@@ -14,8 +14,6 @@
 USE_LIBCPP = "USE_LIBCPP"
 
 class GenericListDataFormatterTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def do_test_with_run_command(self, stdlib_type):

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
index 6a6ad26c9cfdd..c0a21de3a469b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
@@ -15,8 +15,6 @@
 
 class GenericMultiMapDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.namespace = 'std'

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
index 9b9a324ee9d0e..55712a8f7a40b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
@@ -14,8 +14,6 @@
 
 class GenericMultiSetDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.namespace = 'std'

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
index b95abf224ff97..e82d4e092c141 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
@@ -8,8 +8,6 @@
 
 class GenericOptionalDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def do_test_with_run_command(self, stdlib_type):
         """Test that that file and class static variables display correctly."""
         # This is the function to remove the custom formats in order to have a

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
index 5c8cabcc6947a..280670df48f32 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
@@ -14,8 +14,6 @@
 
 class GenericSetDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.namespace = 'std'

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
index 646836696ff03..6bb14417ea2d4 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
@@ -6,7 +6,6 @@
 USE_LIBCPP = "USE_LIBCPP"
 
 class GenericUnorderedDataFormatterTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
index 78394c90a3a29..89a2b5f5ba300 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
@@ -13,8 +13,6 @@
 
 class LibCxxAtomicTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def get_variable(self, name):
         var = self.frame().FindVariable(name)
         var.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
index c99a4b0b82bdf..ecd808d12cd37 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
@@ -12,8 +12,6 @@
 
 class LibCxxFunctionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Run frame var for a variable twice. Verify we do not hit the cache
     # the first time but do the second time.
     def run_frame_var_check_cache_use(self, variable, result_to_match, skip_find_function=False):

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
index 16b64210d6592..1d6bab50a2243 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
@@ -12,8 +12,6 @@
 
 class InitializerListTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     def test(self):
         """Test that that file and class static variables display correctly."""

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
index 9081edc2bfc62..55db9c2051cca 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
@@ -12,8 +12,6 @@
 
 class LibcxxIteratorDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
index 87173c9aad42b..e0111ea189f9c 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
@@ -12,8 +12,6 @@
 
 class LibcxxMapDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         ns = 'ndk' if lldbplatformutil.target_is_android() else ''

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
index e2b882e6befef..1d67db86fa16b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/queue/TestDataFormatterLibcxxQueue.py
@@ -12,8 +12,6 @@
 
 class TestDataFormatterLibcxxQueue(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.namespace = 'std'

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
index 8e77d53225a7f..663058e07653c 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
@@ -11,8 +11,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     def test_shared_ptr_variables(self):
         """Test `frame variable` output for `std::shared_ptr` types."""

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py
index 207e7458c9a83..3236544e21859 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/span/TestDataFormatterLibcxxSpan.py
@@ -9,8 +9,6 @@
 
 class LibcxxSpanDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def findVariable(self, name):
         var = self.frame().FindVariable(name)
         self.assertTrue(var.IsValid())

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
index 168297cc0611f..07b1aff74cfcd 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
@@ -13,8 +13,6 @@
 
 class LibcxxStringDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
index 955743caae91e..db82e7c65e033 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
@@ -13,8 +13,6 @@
 
 class LibcxxStringViewDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py
index 171f9a8e5c078..62de084304a2b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/TestDataFormatterLibcxxTuple.py
@@ -12,8 +12,6 @@
 
 class TestDataFormatterLibcxxTuple(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number('main.cpp', '// break here')

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
index 825513a0b49bc..70efdd84f242a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
@@ -11,8 +11,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     def test_unique_ptr_variables(self):
         """Test `frame variable` output for `std::unique_ptr` types."""

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py
index 181dca7724932..27724b25ae54e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/variant/TestDataFormatterLibcxxVariant.py
@@ -11,8 +11,6 @@
 
 class LibcxxVariantDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     ## Clang 7.0 is the oldest Clang that can reliably parse newer libc++ versions
     ## with -std=c++17.

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
index 67e0629e6b733..309c6939cb33f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
@@ -12,8 +12,6 @@
 
 class LibcxxVBoolDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
index 45dffdae269d0..f478421c3c0e6 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
@@ -12,8 +12,6 @@
 
 class LibcxxVectorDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_numbers(self, var_name):
         self.expect("frame variable " + var_name,
                     substrs=[var_name + ' = size=7',

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
index cac5411f56b0a..fc7ec96b8099a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
@@ -12,8 +12,6 @@
 
 class StdIteratorDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
index e3e2e1b0ee999..abd1043cf4fcb 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
@@ -12,8 +12,6 @@
 
 class StdMapDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
index 6876dee232c45..3d37af31d66c5 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
@@ -10,7 +10,6 @@
 
 
 class StdSmartPtrDataFormatterTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
index 1325f49b728ad..6ce7235ff015d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
@@ -13,8 +13,6 @@
 
 class StdStringDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
index 7d1ac7c91bdb2..15a9f1ab0b4cf 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
@@ -10,7 +10,6 @@
 
 
 class StdTupleDataFormatterTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
index a91d9f78867ac..474a992818b56 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
@@ -10,7 +10,6 @@
 
 
 class StdUniquePtrDataFormatterTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
index 5a767b34c235a..b7d112bb26651 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
@@ -12,8 +12,6 @@
 
 class StdVBoolDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
index 8d46a08ab6962..d40a96ad1a6f9 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
@@ -12,8 +12,6 @@
 
 class StdVectorDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index 51d42fc5e7bba..7a2ea73f364e7 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
@@ -11,8 +11,6 @@
 
 class SynthDataFormatterTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
index be40cd783bd55..c7bed39f382e6 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
@@ -12,8 +12,6 @@
 
 class DataFormatterSynthTypeTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index 0deaf799a7a12..e47952971726e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -13,8 +13,6 @@
 
 class DataFormatterSynthValueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index 0537c5caa91ec..9e77f51e72dec 100644
--- a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
@@ -11,8 +11,6 @@
 
 class FormatPropagationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index a6a61f1d7bd04..21c308954dc47 100644
--- a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
@@ -11,8 +11,6 @@
 
 class FrameFormatSmallStructTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index 80a02d06cfe3c..d7fd5a48f0fad 100644
--- a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -11,8 +11,6 @@
 
 class DataFormatterHexCapsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
index 62bd058666b67..d2b13334fd261 100644
--- a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
+++ b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
@@ -11,8 +11,6 @@
 
 class LanguageCategoryUpdatesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
index a9b96bb02a8d1..15ad88f749a89 100644
--- a/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
@@ -12,8 +12,6 @@
 
 class NSArraySyntheticTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index eb54f53bd8113..fc6755f43ba71 100644
--- a/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
@@ -12,8 +12,6 @@
 
 class NSDictionarySyntheticTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index 219ed2c3aacba..e34b25c10e65d 100644
--- a/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
@@ -12,8 +12,6 @@
 
 class NSSetSyntheticTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
index c4180089ffafe..ccfc302f2d065 100644
--- a/lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
+++ b/lldb/test/API/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
@@ -12,8 +12,6 @@
 
 class DataFormatterOSTypeTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
index c30626468861b..04ad8e26e05e2 100644
--- a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
+++ b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
@@ -12,8 +12,6 @@
 
 class PrintArrayTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_print_array(self):
         """Test that expr -Z works"""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py b/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
index 3fcb2794b9520..3f1190a9388c4 100644
--- a/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
+++ b/lldb/test/API/functionalities/data-formatter/poarray/TestPrintObjectArray.py
@@ -12,8 +12,6 @@
 
 class PrintObjectArrayTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test_print_array(self):
         """Test that expr -O -Z works"""

diff  --git a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
index b0f7002966c20..7c0eafb61c208 100644
--- a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
+++ b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
@@ -11,8 +11,6 @@
 
 class PtrRef2TypedefTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py
index 22ce7442a6289..889ac6dc40b2c 100644
--- a/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py
+++ b/lldb/test/API/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py
@@ -11,8 +11,6 @@
 
 
 class PyObjectSynthProviderTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_print_array(self):

diff  --git a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index 1dc37c64f367a..4ffb595446d38 100644
--- a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
@@ -11,8 +11,6 @@
 
 class DataFormatterRefPtrRecursionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
index 88ec1ff8c822d..38cc051c2e31f 100644
--- a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
+++ b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
@@ -12,7 +12,6 @@
 class Radar9974002DataFormatterTestCase(TestBase):
 
     # test for rdar://problem/9974002 ()
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         # Call super's setUp().

diff  --git a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index c1d308b98ffe5..06d767df816ee 100644
--- a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -12,8 +12,6 @@
 
 class SyntheticCappingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
index 307a2691e1dce..9743ce5d6c96a 100644
--- a/lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
+++ b/lldb/test/API/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
@@ -12,8 +12,6 @@
 
 class SyntheticFilterRecomputingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py
index a47d91434822e..f97a4aec490a4 100644
--- a/lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py
+++ b/lldb/test/API/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py
@@ -12,8 +12,6 @@
 
 class TypeSummaryListArgumentTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_type_summary_list_with_arg(self):
         """Test that the 'type summary list' command handles command line arguments properly"""

diff  --git a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
index 7d70ad3da9c42..d361498bcc010 100644
--- a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
+++ b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
@@ -12,8 +12,6 @@
 
 class TypeSummaryListScriptTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_typesummarylist_script(self):
         """Test data formatter commands."""
         self.build()

diff  --git a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index ad4db01411faa..adcf898b1cfed 100644
--- a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
@@ -11,8 +11,6 @@
 
 class UserFormatVSSummaryTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index c1ec60e9e10b2..4a6b4790f8c9c 100644
--- a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
+++ b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
@@ -11,8 +11,6 @@
 
 class VarInAggregateMisuseTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
index e5b1945d65672..b23a29b7d44fb 100644
--- a/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
@@ -12,8 +12,6 @@
 
 class DataFormatterVarScriptFormatting(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index ab3499ee926df..2eb34a8bc27d5 100644
--- a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -13,8 +13,6 @@
 
 class VectorTypesFormattingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
index fc3e36e9233cf..f28cd95dba548 100644
--- a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
@@ -12,8 +12,6 @@
 
 class DeadStripTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr44429")
     def test(self):
         """Test breakpoint works correctly with dead-code stripping."""

diff  --git a/lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py b/lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py
index 0de7645844435..248ea143d9d6e 100644
--- a/lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py
+++ b/lldb/test/API/functionalities/deleted-executable/TestDeletedExecutable.py
@@ -11,8 +11,6 @@
 from lldbsuite.test import lldbutil
 
 class TestDeletedExecutable(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows # cannot delete a running executable

diff  --git a/lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py b/lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py
index 0e0bea1a2547b..17cefd5fa8fa4 100644
--- a/lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py
+++ b/lldb/test/API/functionalities/diagnostic_reporting/TestDiagnosticReporting.py
@@ -9,8 +9,6 @@
 
 class TestDiagnosticReporting(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py b/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
index c5b9921d7e62d..421aa94b79c09 100644
--- a/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
+++ b/lldb/test/API/functionalities/disassemble/aarch64-adrp-add/TestAArch64AdrpAdd.py
@@ -8,8 +8,6 @@
 
 class TestAArch64AdrpAdd(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfLLVMTargetMissing("AArch64")
     def test_arm64(self):

diff  --git a/lldb/test/API/functionalities/dlopen_other_executable/TestDlopenOtherExecutable.py b/lldb/test/API/functionalities/dlopen_other_executable/TestDlopenOtherExecutable.py
index 1b9135aa6be2e..4047a3712760a 100644
--- a/lldb/test/API/functionalities/dlopen_other_executable/TestDlopenOtherExecutable.py
+++ b/lldb/test/API/functionalities/dlopen_other_executable/TestDlopenOtherExecutable.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     @skipIfWindows
     # glibc's dlopen doesn't support opening executables.

diff  --git a/lldb/test/API/functionalities/dyld-exec-linux/TestDyldExecLinux.py b/lldb/test/API/functionalities/dyld-exec-linux/TestDyldExecLinux.py
index 889a1243045d2..7f5e0b19671c2 100644
--- a/lldb/test/API/functionalities/dyld-exec-linux/TestDyldExecLinux.py
+++ b/lldb/test/API/functionalities/dyld-exec-linux/TestDyldExecLinux.py
@@ -11,7 +11,6 @@
 from lldbsuite.test import lldbutil
 
 class TestLinux64ExecViaDynamicLoader(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfXmlSupportMissing

diff  --git a/lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py b/lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py
index ceaae3a97eb3f..87952863747af 100644
--- a/lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py
+++ b/lldb/test/API/functionalities/dyld-launch-linux/TestDyldLaunchLinux.py
@@ -9,7 +9,6 @@
 from lldbsuite.test.lldbtest import *
 
 class TestLinux64LaunchingViaDynamicLoader(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(oslist=no_match(['linux']))
     @no_debug_info_test

diff  --git a/lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
index ead18af1cc1a8..5df44921ef67d 100644
--- a/lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
+++ b/lldb/test/API/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
@@ -12,8 +12,6 @@
 
 class DynamicValueChildCountTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/exec/TestExec.py b/lldb/test/API/functionalities/exec/TestExec.py
index 91dc72df85777..1eb8c5d616833 100644
--- a/lldb/test/API/functionalities/exec/TestExec.py
+++ b/lldb/test/API/functionalities/exec/TestExec.py
@@ -14,8 +14,6 @@ class ExecTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(archs=['i386'],
                         oslist=no_match(["freebsd"]),
                         bugnumber="rdar://28656532")

diff  --git a/lldb/test/API/functionalities/fat_archives/TestFatArchives.py b/lldb/test/API/functionalities/fat_archives/TestFatArchives.py
index 5fa52d31885be..11b3edd44da65 100644
--- a/lldb/test/API/functionalities/fat_archives/TestFatArchives.py
+++ b/lldb/test/API/functionalities/fat_archives/TestFatArchives.py
@@ -11,8 +11,6 @@
 
 class FatArchiveTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
index 459712167e6ff..9fc9631241f87 100644
--- a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
+++ b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
@@ -8,8 +8,6 @@
 
 class FindLineEntry(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_compile_unit_find_line_entry_index(self):
         """ Test the CompileUnit LineEntryIndex lookup API """
         self.build()

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py b/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
index 422d814ef939d..aeaac0bcc9153 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
@@ -93,8 +93,6 @@ def readRegisters(self):
 
 class TestAArch64XMLRegOffsets(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     @skipIfLLVMTargetMissing("AArch64")

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
index fd7432528a08a..6d816bf6c8fd8 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
@@ -7,8 +7,6 @@
 
 class TestArmRegisterDefinition(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestFork.py b/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
index 0a2750db3fc21..79fa520fe22dd 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
@@ -9,8 +9,6 @@
 
 class TestMultiprocess(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def base_test(self, variant):
         class MyResponder(MockGDBServerResponder):
             def __init__(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py
index 8412215a140dc..e99192a6a670f 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteClient.py
@@ -9,8 +9,6 @@
 
 class TestGDBRemoteClient(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     class gPacketResponder(MockGDBServerResponder):
         registers = [
             "name:rax;bitsize:64;offset:0;encoding:uint;format:hex;set:General Purpose Registers;ehframe:0;dwarf:0;",

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
index 46a3df4a7ea8e..97941fe326196 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteDiskFileCompletion.py
@@ -3,8 +3,6 @@
 
 class TestGDBRemoteDiskFileCompletion(GDBPlatformClientTestBase):
 
-    mydir = GDBPlatformClientTestBase.compute_mydir(__file__)
-
     def test_autocomplete_request(self):
         """Test remote disk completion on remote-gdb-server plugin"""
 

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py
index 6a09e17408e24..7b74c17a79270 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemoteLoad.py
@@ -7,8 +7,6 @@
 
 class TestGDBRemoteLoad(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(archs=["aarch64"], oslist=["freebsd"],
                         bugnumber="llvm.org/pr49414")
     def test_module_load_address(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
index 9fc2e255a53d5..8d354b124ea28 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBRemotePlatformFile.py
@@ -4,8 +4,6 @@
 
 class TestGDBRemotePlatformFile(GDBPlatformClientTestBase):
 
-    mydir = GDBPlatformClientTestBase.compute_mydir(__file__)
-
     def test_file(self):
         """Test mock operations on a remote file"""
 

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
index 3fa750c6f6c1e..09a72f33d3f1b 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
@@ -10,8 +10,6 @@
 
 class TestGDBServerTargetXML(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @staticmethod
     def filecheck_to_blob(fc):
         for l in fc.strip().splitlines():

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
index 3bec4b5f1babd..f39bdee1010e7 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
@@ -8,8 +8,6 @@
 
 class TestGDBServerTargetXML(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     @skipIfLLVMTargetMissing("X86")

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestGdbClientModuleLoad.py b/lldb/test/API/functionalities/gdb_remote_client/TestGdbClientModuleLoad.py
index 9a4c4cd059768..8fb2d7f7f0425 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGdbClientModuleLoad.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGdbClientModuleLoad.py
@@ -80,8 +80,6 @@ def qMemoryRegionInfo(self, addr):
 
 class TestGdbClientModuleLoad(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     def test_android_app_process(self):
         """

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestIOSSimulator.py b/lldb/test/API/functionalities/gdb_remote_client/TestIOSSimulator.py
index 59fcdf700cd05..d143c6f49fe98 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestIOSSimulator.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestIOSSimulator.py
@@ -6,8 +6,6 @@
 
 class TestIOSSimulator(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     """
     Test that an ios simulator process is recognized as such.
     """

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
index e1998fbdbe1e0..4c071bada5b74 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
@@ -7,8 +7,6 @@
 
 class TestJLink6Armv7RegisterDefinition(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py b/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
index 88bc300fb772e..2671f8c945841 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestMemoryRegionDirtyPages.py
@@ -7,8 +7,6 @@
 
 class TestMemoryRegionDirtyPages(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     def test(self):
         class MyResponder(MockGDBServerResponder):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py b/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
index b2b36050f0a32..be9d46f639bcc 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
@@ -9,8 +9,6 @@
 
 class TestMultiprocess(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_qfThreadInfo(self):
         class MyResponder(MockGDBServerResponder):
             def qfThreadInfo(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py b/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
index 564fd561ae65c..4880b53a634a1 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
@@ -7,8 +7,6 @@
 
 class TestNestedRegDefinitions(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
index 5efe110f4139e..87a4240422e59 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
@@ -23,8 +23,6 @@
 
 class TestNoGPacketSupported(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     def test(self):
         class MyResponder(MockGDBServerResponder):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoLocalFile.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoLocalFile.py
index 969b535850ab7..76ad4fbec33c6 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoLocalFile.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoLocalFile.py
@@ -8,8 +8,6 @@ class TestNoLocalFile(GDBRemoteTestBase):
     """ Test the case where there is NO local copy of the file
         being debugged.  We shouldn't immediately error out, but
         rather lldb should ask debugserver if it knows about the file. """
-
-    mydir = TestBase.compute_mydir(__file__)
     
     @skipIfXmlSupportMissing
     def test_with_python(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
index 114e76d8fdd02..6333fa3eb10cb 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
@@ -7,8 +7,6 @@
 
 class TestNoWatchpointSupportInfo(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py b/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
index bfd7326f6ee4c..744fff3c34004 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
@@ -8,8 +8,6 @@
 
 class TestPartialGPacket(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py
index 7dec787b07bd8..e59b54e27c82b 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformClient.py
@@ -12,8 +12,6 @@ def hexlify(string):
 
 class TestPlatformClient(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_process_list_with_all_users(self):
         """Test connecting to a remote linux platform"""
 

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformKill.py b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformKill.py
index 2a701b42ede88..66a69a4ca91f3 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformKill.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformKill.py
@@ -7,8 +7,6 @@
 
 class TestPlatformKill(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr52451")
     def test_kill_
diff erent_platform(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
index 3d3de0a9707c0..a31f9954143f7 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
@@ -7,8 +7,6 @@
 
 class TestPlatformMacOSX(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     class MyResponder(MockGDBServerResponder):
 
         def __init__(self, host):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py b/lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py
index d6d5a964401a0..1e0a519f420fa 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py
@@ -10,8 +10,6 @@
 @skipIfRemote
 class TestProcessConnect(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_gdb_remote_sync(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestPty.py b/lldb/test/API/functionalities/gdb_remote_client/TestPty.py
index fe9d98faa3102..69044b6dd2858 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPty.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPty.py
@@ -7,7 +7,6 @@
 
 @skipIfWindows
 class TestPty(GDBRemoteTestBase):
-    mydir = TestBase.compute_mydir(__file__)
     server_socket_class = PtyServerSocket
 
     def get_term_attrs(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestQemuAArch64TargetXml.py b/lldb/test/API/functionalities/gdb_remote_client/TestQemuAArch64TargetXml.py
index 2ad9a2cf7bba4..9d8f6f47b3c13 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestQemuAArch64TargetXml.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestQemuAArch64TargetXml.py
@@ -53,8 +53,6 @@ def qXferRead(self, obj, annex, offset, length):
 
 class TestQemuAarch64TargetXml(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     @skipIfLLVMTargetMissing("AArch64")

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py b/lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py
index 9d32514416c3f..ce57da14e6067 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRecognizeBreakpoint.py
@@ -7,8 +7,6 @@
 
 class TestRecognizeBreakpoint(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     """ This tests the case where the gdb-remote server doesn't support any
         of the thread-info packets, and just tells which thread got the stop
         signal with:

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py b/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
index 6186ec3f9fdbe..3b80d98f0a7e3 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
@@ -8,8 +8,6 @@
 
 class TestRegDefinitionInParts(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py b/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
index 57219462873df..1e7da3edc9ef2 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
@@ -17,8 +17,6 @@
 
 class TestRemoteRegNums(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     def test(self):
         class MyResponder(MockGDBServerResponder):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py b/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
index 853e1138b9ef3..99fdda1788455 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
@@ -8,8 +8,6 @@
 
 class TestRestartBug(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(bugnumber="llvm.org/pr24530")
     def test(self):
         """

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py b/lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py
index 1bbd447a230b2..932b1f9f11efe 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestStopPCs.py
@@ -7,8 +7,6 @@
 
 class TestStopPCs(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     def test(self):
         class MyResponder(MockGDBServerResponder):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py b/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
index f7885459ad450..c3e6b5cb01e92 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
@@ -102,8 +102,6 @@ def readRegister(self, register):
 
 class TestTargetXMLArch(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfXmlSupportMissing
     @expectedFailureAll(archs=["i386"])
     @skipIfRemote

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestThreadInfoTrailingComma.py b/lldb/test/API/functionalities/gdb_remote_client/TestThreadInfoTrailingComma.py
index 08de888c21f84..afa41e246194a 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestThreadInfoTrailingComma.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestThreadInfoTrailingComma.py
@@ -6,8 +6,6 @@
 
 class TestThreadInfoTrailingComma(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         class MyResponder(MockGDBServerResponder):
             def haltReason(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py b/lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py
index d05e6874f85bb..98cd40466fa6a 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestThreadSelectionBug.py
@@ -7,8 +7,6 @@
 
 class TestThreadSelectionBug(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         class MyResponder(MockGDBServerResponder):
             def cont(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestWasm.py b/lldb/test/API/functionalities/gdb_remote_client/TestWasm.py
index 0d94e78883587..e379c3a74c453 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestWasm.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestWasm.py
@@ -85,8 +85,6 @@ def readMemory(self, addr, length):
 
 class TestWasm(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfAsan
     @skipIfXmlSupportMissing
     def test_load_module_with_embedded_symbols_from_remote(self):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py b/lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py
index f5cd25a975309..165b9cba15d0b 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestWriteMemory.py
@@ -6,8 +6,6 @@
 
 class TestWriteMemory(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
 
         class MyResponder(MockGDBServerResponder):

diff  --git a/lldb/test/API/functionalities/gdb_remote_client/TestqOffsets.py b/lldb/test/API/functionalities/gdb_remote_client/TestqOffsets.py
index 9fdc25a7e307e..c9aa0210b4d75 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestqOffsets.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestqOffsets.py
@@ -6,8 +6,6 @@
 
 class TestqOffsets(GDBRemoteTestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     class Responder(MockGDBServerResponder):
         def qOffsets(self):
             return 'Text=470000;Data=470000'

diff  --git a/lldb/test/API/functionalities/history/TestHistoryRecall.py b/lldb/test/API/functionalities/history/TestHistoryRecall.py
index 2c17fd3e77446..3ce743584d60c 100644
--- a/lldb/test/API/functionalities/history/TestHistoryRecall.py
+++ b/lldb/test/API/functionalities/history/TestHistoryRecall.py
@@ -11,8 +11,6 @@
 
 class TestHistoryRecall(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
index 5ac4eeb0514af..235ed94816bb5 100644
--- a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
@@ -12,8 +12,6 @@
 
 class AssertingInferiorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["windows"],
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")

diff  --git a/lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py
index 95cdfb5591fa0..1af7a75deccd1 100644
--- a/lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py
+++ b/lldb/test/API/functionalities/inferior-changed/TestInferiorChanged.py
@@ -12,8 +12,6 @@
 
 class ChangedInferiorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(hostoslist=["windows"])
     @no_debug_info_test
     def test_inferior_crashing(self):

diff  --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
index 4a5cf853caa07..5c4abff6e0f0d 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -11,8 +11,6 @@
 
 class CrashingInferiorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):

diff  --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
index d03543df7198a..0d992b6be5aeb 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
@@ -10,8 +10,6 @@
 
 class CrashingInferiorStepTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):

diff  --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 915d47ff22059..0b4dd18844c22 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -11,8 +11,6 @@
 
 class CrashingRecursiveInferiorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_recursive_inferior_crashing(self):

diff  --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
index 8b0263307f610..4d3c23f58d6bf 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
@@ -10,8 +10,6 @@
 
 class CrashingRecursiveInferiorStepTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_recursive_inferior_crashing_step(self):
         """Test that stepping after a crash behaves correctly."""
         self.build()

diff  --git a/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
index 44b8683891736..64045739984c7 100644
--- a/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
+++ b/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
@@ -10,8 +10,6 @@
 
 class TestInlineStepping(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @expectedFailureAll(
         compiler="icc",

diff  --git a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index d7f4f8399baf4..a857e28ebf2cb 100644
--- a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
@@ -11,8 +11,6 @@
 
 class JITLoaderGDBTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipTestIfFn(
         lambda: "Skipped because the test crashes the test runner",
         bugnumber="llvm.org/pr24702")

diff  --git a/lldb/test/API/functionalities/launch_stop_at_entry/TestStopAtEntry.py b/lldb/test/API/functionalities/launch_stop_at_entry/TestStopAtEntry.py
index 79e66c7dabd9e..93c721a130842 100644
--- a/lldb/test/API/functionalities/launch_stop_at_entry/TestStopAtEntry.py
+++ b/lldb/test/API/functionalities/launch_stop_at_entry/TestStopAtEntry.py
@@ -13,8 +13,6 @@
 
 
 class TestStopAtEntry(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # The port used by debugserver.

diff  --git a/lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py b/lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py
index 326315c838e5c..f47c1c556104a 100644
--- a/lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py
+++ b/lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py
@@ -15,7 +15,6 @@
 class TestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
       TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py b/lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py
index 60dd7cf962821..fc768df07d854 100644
--- a/lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py
+++ b/lldb/test/API/functionalities/limit-debug-info/TestLimitDebugInfo.py
@@ -11,8 +11,6 @@
 
 class LimitDebugInfoTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def _check_type(self, target, name):
         exe = target.FindModule(lldb.SBFileSpec("a.out"))
         type_ = exe.FindFirstType(name)

diff  --git a/lldb/test/API/functionalities/load_after_attach/TestLoadAfterAttach.py b/lldb/test/API/functionalities/load_after_attach/TestLoadAfterAttach.py
index de691e6fdda45..6ab82205a7863 100644
--- a/lldb/test/API/functionalities/load_after_attach/TestLoadAfterAttach.py
+++ b/lldb/test/API/functionalities/load_after_attach/TestLoadAfterAttach.py
@@ -4,8 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py b/lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
index 35789147a33fe..d7e6e182c7f49 100644
--- a/lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
+++ b/lldb/test/API/functionalities/load_lazy/TestLoadUsingLazyBind.py
@@ -13,8 +13,6 @@
 
 
 class LoadUsingLazyBind(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/functionalities/load_unload/TestLoadUnload.py b/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
index 15e602cc784db..eb5c5592cd8c7 100644
--- a/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
@@ -15,8 +15,6 @@
 
 class LoadUnloadTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py b/lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py
index f0c944146b214..80f852c12b953 100644
--- a/lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py
+++ b/lldb/test/API/functionalities/load_using_paths/TestLoadUsingPaths.py
@@ -14,8 +14,6 @@
 @skipIfWindows  # The Windows platform doesn't implement DoLoadImage.
 class LoadUsingPathsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
index 122d1a4ae8c1d..4e36013b604e0 100644
--- a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
+++ b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
@@ -8,8 +8,6 @@
 
 class LocationListLookupTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/longjmp/TestLongjmp.py b/lldb/test/API/functionalities/longjmp/TestLongjmp.py
index 9e51a98dfc8aa..22e4cb1cedce9 100644
--- a/lldb/test/API/functionalities/longjmp/TestLongjmp.py
+++ b/lldb/test/API/functionalities/longjmp/TestLongjmp.py
@@ -12,8 +12,6 @@
 
 class LongjmpTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfDarwin  # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
     @expectedFailureAll(oslist=["freebsd", "linux"], bugnumber="llvm.org/pr20231")
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")

diff  --git a/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py b/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
index cad54c8f892f2..d84e0bc814436 100644
--- a/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
+++ b/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
@@ -12,8 +12,6 @@
 
 class MemoryCommandRegion(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/memory/cache/TestMemoryCache.py b/lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
index 7eb5b05a56e10..97cd7019075a5 100644
--- a/lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
+++ b/lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
@@ -12,8 +12,6 @@
 
 class MemoryCacheTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/memory/find/TestMemoryFind.py b/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
index 7b97689176c0e..02146d15fad3c 100644
--- a/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
+++ b/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
@@ -12,8 +12,6 @@
 
 class MemoryFindTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/memory/tag/TestMemoryTag.py b/lldb/test/API/functionalities/memory/tag/TestMemoryTag.py
index f54e18485d1fc..c9af1ab566ab3 100644
--- a/lldb/test/API/functionalities/memory/tag/TestMemoryTag.py
+++ b/lldb/test/API/functionalities/memory/tag/TestMemoryTag.py
@@ -12,8 +12,6 @@
 
 class MemoryTagTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_memory_tag_read_unsupported(self):

diff  --git a/lldb/test/API/functionalities/module_cache/bsd/TestModuleCacheBSD.py b/lldb/test/API/functionalities/module_cache/bsd/TestModuleCacheBSD.py
index fdd7d7904f833..e4513bce8346e 100644
--- a/lldb/test/API/functionalities/module_cache/bsd/TestModuleCacheBSD.py
+++ b/lldb/test/API/functionalities/module_cache/bsd/TestModuleCacheBSD.py
@@ -11,8 +11,6 @@
 
 class ModuleCacheTestcaseBSD(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/module_cache/debug_index/TestDebugIndexCache.py b/lldb/test/API/functionalities/module_cache/debug_index/TestDebugIndexCache.py
index 9a77309d6e221..6ae5db1b9a9d0 100644
--- a/lldb/test/API/functionalities/module_cache/debug_index/TestDebugIndexCache.py
+++ b/lldb/test/API/functionalities/module_cache/debug_index/TestDebugIndexCache.py
@@ -10,8 +10,6 @@
 
 class DebugIndexCacheTestcase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/module_cache/simple_exe/TestModuleCacheSimple.py b/lldb/test/API/functionalities/module_cache/simple_exe/TestModuleCacheSimple.py
index 6180203c4bb37..daf5f92bbc970 100644
--- a/lldb/test/API/functionalities/module_cache/simple_exe/TestModuleCacheSimple.py
+++ b/lldb/test/API/functionalities/module_cache/simple_exe/TestModuleCacheSimple.py
@@ -11,8 +11,6 @@
 
 class ModuleCacheTestcaseSimple(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/module_cache/universal/TestModuleCacheUniversal.py b/lldb/test/API/functionalities/module_cache/universal/TestModuleCacheUniversal.py
index 0762bd86c4ebf..3509859cbc70d 100644
--- a/lldb/test/API/functionalities/module_cache/universal/TestModuleCacheUniversal.py
+++ b/lldb/test/API/functionalities/module_cache/universal/TestModuleCacheUniversal.py
@@ -11,8 +11,6 @@
 
 class ModuleCacheTestcaseUniversal(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py b/lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py
index a4deb96c75ac9..863afe14b2fb0 100644
--- a/lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py
+++ b/lldb/test/API/functionalities/mtc/simple/TestMTCSimple.py
@@ -12,8 +12,6 @@
 
 class MTCSimpleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @skipIf(compiler="clang", compiler_version=['<', '9.0'])
     def test(self):

diff  --git a/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py b/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
index 845950758f8ef..6df914a243a15 100644
--- a/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
+++ b/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
@@ -13,8 +13,6 @@
 
 class MultipleDebuggersCommandsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_multipledebuggers_commands(self):
         """Test that commands do not try and hold on to stale CommandInterpreters in a multiple debuggers scenario"""

diff  --git a/lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py b/lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py
index 00c711bc11f9d..e8b14d1629e1b 100644
--- a/lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py
+++ b/lldb/test/API/functionalities/multiword-commands/TestMultiWordCommands.py
@@ -8,8 +8,6 @@
 
 class MultiwordCommandsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_ambiguous_subcommand(self):
         self.expect("platform s", error=True,

diff  --git a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index d5424c0bb40cb..22eff4a6f4fff 100644
--- a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
@@ -10,8 +10,6 @@
 
 class NonOverlappingIndexVariableCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = 'main.cpp'

diff  --git a/lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py
index 1ad90e4fce51d..195539709a209 100644
--- a/lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/test/API/functionalities/object-file/TestImageListMultiArchitecture.py
@@ -17,8 +17,6 @@
 
 class TestImageListMultiArchitecture(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfRemote
     def test_image_list_shows_multiple_architectures(self):

diff  --git a/lldb/test/API/functionalities/paths/TestPaths.py b/lldb/test/API/functionalities/paths/TestPaths.py
index 5e9a79b596277..4a4a7d5b7c043 100644
--- a/lldb/test/API/functionalities/paths/TestPaths.py
+++ b/lldb/test/API/functionalities/paths/TestPaths.py
@@ -15,8 +15,6 @@
 
 class TestPaths(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_paths(self):
         '''Test to make sure no file names are set in the lldb.SBFileSpec objects returned by lldb.SBHostOS.GetLLDBPath() for paths that are directories'''

diff  --git a/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py b/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
index b688bd4ce0c75..d64492772e3a7 100644
--- a/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
+++ b/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
@@ -13,8 +13,6 @@
 
 class PluginCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.generateSource('plugin.cpp')

diff  --git a/lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
index d1a387527af59..c778a556f9fa1 100644
--- a/lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
+++ b/lldb/test/API/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
@@ -11,8 +11,6 @@
 
 
 class PluginPythonOSPlugin(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_python_os_plugin(self):

diff  --git a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
index f711b36657fa3..17c5d9c337314 100644
--- a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
+++ b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
@@ -14,8 +14,6 @@
 
 
 class TestOSPluginStepping(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows

diff  --git a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
index aaeaef75810cb..7f5b7e0b83585 100644
--- a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
+++ b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
@@ -9,7 +9,6 @@
 
 
 class TestPointerNumChilden(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_pointer_num_children(self):
         self.build()

diff  --git a/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelLive.py b/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelLive.py
index 98c87461a6080..d571462c96119 100644
--- a/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelLive.py
+++ b/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelLive.py
@@ -11,8 +11,6 @@
 class FreeBSDKernelVMCoreTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_mem(self):
         kernel_exec = "/boot/kernel/kernel"
         mem_device = "/dev/mem"

diff  --git a/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelVMCore.py b/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelVMCore.py
index 0cbf43fe027e5..a20a4b935fbe9 100644
--- a/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelVMCore.py
+++ b/lldb/test/API/functionalities/postmortem/FreeBSDKernel/TestFreeBSDKernelVMCore.py
@@ -13,8 +13,6 @@ class FreeBSDKernelVMCoreTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
     maxDiff = None
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def make_target(self, src_filename):
         src = self.getSourcePath(src_filename)
         dest = self.getBuildArtifact("kernel")

diff  --git a/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py b/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
index d1948b6752753..0ac0d927e526e 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
+++ b/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
@@ -17,8 +17,6 @@
 class LinuxCoreTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     _aarch64_pid = 37688
     _aarch64_pac_pid = 387
     _i386_pid = 32306

diff  --git a/lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py b/lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py
index 6e16ce307846d..0f3f4845d0c1f 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py
+++ b/lldb/test/API/functionalities/postmortem/elf-core/gcore/TestGCore.py
@@ -13,8 +13,6 @@
 class GCoreTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     _i386_pid = 5586
     _x86_64_pid = 5669
 

diff  --git a/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py
index 6e34c914ae289..398af86eede83 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py
+++ b/lldb/test/API/functionalities/postmortem/elf-core/thread_crash/TestLinuxCoreThreads.py
@@ -13,8 +13,6 @@
 class LinuxCoreThreadsTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     _i386_pid = 5193
     _x86_64_pid = 5222
 

diff  --git a/lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py b/lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py
index 0caefd0bee501..abc37c6de4fe2 100644
--- a/lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py
+++ b/lldb/test/API/functionalities/postmortem/mach-core/TestMachCore.py
@@ -13,8 +13,6 @@
 class MachCoreTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # This was originally marked as expected failure on Windows, but it has
     # started timing out instead, so the expectedFailure attribute no longer
     # correctly tracks it: llvm.org/pr37371

diff  --git a/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
index 7ada036443d17..286ff0730cbb0 100644
--- a/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
+++ b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpNew.py
@@ -14,8 +14,6 @@
 
 class MiniDumpNewTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     _linux_x86_64_pid = 29917

diff  --git a/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
index bb4e61ba70b46..98a4464cc2319 100644
--- a/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
+++ b/lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py
@@ -14,8 +14,6 @@
 
 class MiniDumpUUIDTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def verify_module(self, module, verify_path, verify_uuid):

diff  --git a/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py
index d14959a29e141..4d08efc9b0538 100644
--- a/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py
+++ b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py
@@ -12,8 +12,6 @@
 
 
 class MiniDumpTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_process_info_in_mini_dump(self):

diff  --git a/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py b/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
index f967a57e4ea71..fb0201690f7c7 100644
--- a/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
+++ b/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
@@ -16,8 +16,6 @@
 class NetBSDCoreCommonTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_memory_regions(self, process, region_count):
         region_list = process.GetMemoryRegions()
         self.assertEqual(region_list.GetSize(), region_count)

diff  --git a/lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py b/lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py
index cbfc8525ea224..d057856926e12 100644
--- a/lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py
+++ b/lldb/test/API/functionalities/postmortem/wow64_minidump/TestWow64MiniDump.py
@@ -17,8 +17,6 @@
 
 
 class Wow64MiniDumpTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_wow64_mini_dump(self):

diff  --git a/lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py b/lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py
index 1ac18a771f16e..c9f7a3e3d7839 100644
--- a/lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py
+++ b/lldb/test/API/functionalities/pre_run_dylibs/TestPreRunDylibs.py
@@ -6,8 +6,6 @@
 from lldbsuite.test.decorators import *
 
 class TestPreRunLibraries(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(oslist=no_match(['darwin','macos']))

diff  --git a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
index 0681a3f8c969e..30190e7c4df9b 100644
--- a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
+++ b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
@@ -13,8 +13,6 @@
 
 class PlatformProcessCrashInfoTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.runCmd("settings set auto-confirm true")

diff  --git a/lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py b/lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py
index dc75d4fa4020a..8a63cb3ab4ee1 100644
--- a/lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py
+++ b/lldb/test/API/functionalities/process_group/TestChangeProcessGroup.py
@@ -10,8 +10,6 @@
 
 
 class ChangeProcessGroupTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
index 7da3884859908..c9ef69884230e 100644
--- a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
+++ b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
@@ -12,8 +12,6 @@
 
 class ProcessSaveCoreTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     @skipUnlessWindows
     def test_cannot_save_core_unless_process_stopped(self):

diff  --git a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
index f2ea380751a77..a19a86d0cbabd 100644
--- a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
+++ b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
@@ -12,8 +12,6 @@
 
 class ProcessSaveCoreMinidumpTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessArch("x86_64")
     @skipUnlessPlatform(["linux"])
     def test_save_linux_mini_dump(self):

diff  --git a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
index 02c0618e3d071..164ccbf72bf8e 100644
--- a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
@@ -10,8 +10,6 @@
 
 class TestProgressReporting(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.broadcaster = self.dbg.GetBroadcaster()

diff  --git a/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
index 53765b0b37936..3f76102525209 100644
--- a/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
@@ -14,8 +14,6 @@
 
 class TestTrimmedProgressReporting(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def do_test(self, term_width, pattern_list):
         self.build()
         # Start with a small window

diff  --git a/lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py b/lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py
index 96073ea7fa6b3..a1dd08daa0755 100644
--- a/lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py
+++ b/lldb/test/API/functionalities/ptr_refs/TestPtrRefs.py
@@ -11,8 +11,6 @@
 
 class TestPtrRefs(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfAsan # The output looks 
diff erent under ASAN.
     @skipUnlessDarwin
     def test_ptr_refs(self):

diff  --git a/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
index 1653fe36af7b0..09651250a3f65 100644
--- a/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
@@ -13,8 +13,6 @@
 
 class ValueObjectRecursionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/reproducers/attach/TestReproducerAttach.py b/lldb/test/API/functionalities/reproducers/attach/TestReproducerAttach.py
index 75372d3409eea..9df70f1bd4f0b 100644
--- a/lldb/test/API/functionalities/reproducers/attach/TestReproducerAttach.py
+++ b/lldb/test/API/functionalities/reproducers/attach/TestReproducerAttach.py
@@ -11,8 +11,6 @@
 
 
 class ReproducerAttachTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNetBSD

diff  --git a/lldb/test/API/functionalities/reproducers/fs-case-sensitivity/TestReproducerFSCaseSensitivity.py b/lldb/test/API/functionalities/reproducers/fs-case-sensitivity/TestReproducerFSCaseSensitivity.py
index e6bcd4418bb84..d23070dc51668 100644
--- a/lldb/test/API/functionalities/reproducers/fs-case-sensitivity/TestReproducerFSCaseSensitivity.py
+++ b/lldb/test/API/functionalities/reproducers/fs-case-sensitivity/TestReproducerFSCaseSensitivity.py
@@ -11,8 +11,6 @@
 
 
 class ReproducerFileSystemSensitivityTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNetBSD

diff  --git a/lldb/test/API/functionalities/rerun/TestRerun.py b/lldb/test/API/functionalities/rerun/TestRerun.py
index d2e5701f28e23..366272f605fda 100644
--- a/lldb/test/API/functionalities/rerun/TestRerun.py
+++ b/lldb/test/API/functionalities/rerun/TestRerun.py
@@ -11,8 +11,6 @@
 
 class TestRerun(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         exe = self.getBuildArtifact("a.out")

diff  --git a/lldb/test/API/functionalities/return-value/TestReturnValue.py b/lldb/test/API/functionalities/return-value/TestReturnValue.py
index 8670c44dcb6c6..67a268aeb8c52 100644
--- a/lldb/test/API/functionalities/return-value/TestReturnValue.py
+++ b/lldb/test/API/functionalities/return-value/TestReturnValue.py
@@ -12,8 +12,6 @@
 
 class ReturnValueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def affected_by_pr33042(self):
         return ("clang" in self.getCompiler() and self.isAArch64() and
             self.getPlatform() == "linux")

diff  --git a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
index 822a9bf17113e..d1e75cd623864 100644
--- a/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
+++ b/lldb/test/API/functionalities/scripted_process/TestScriptedProcess.py
@@ -14,8 +14,6 @@ class ScriptedProcesTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
index 5556c9a36b696..773c34c537636 100644
--- a/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
+++ b/lldb/test/API/functionalities/scripted_process/TestStackCoreScriptedProcess.py
@@ -14,8 +14,6 @@ class StackCoreScriptedProcesTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/set-data/TestSetData.py b/lldb/test/API/functionalities/set-data/TestSetData.py
index 08477f3c6cfa7..c2d4ebc0d17d3 100644
--- a/lldb/test/API/functionalities/set-data/TestSetData.py
+++ b/lldb/test/API/functionalities/set-data/TestSetData.py
@@ -12,8 +12,6 @@
 
 class SetDataTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["objc"])
     def test_set_data(self):
         """Test setting the contents of variables and registers using raw data."""

diff  --git a/lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py b/lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py
index 76d24d5d4e521..5ddbfb61e5ddd 100644
--- a/lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py
+++ b/lldb/test/API/functionalities/show_location/TestShowLocationDwarf5.py
@@ -7,8 +7,6 @@
 
 class TestTargetSourceMap(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(archs="aarch64", oslist="linux",
             bugnumber="https://bugs.llvm.org/show_bug.cgi?id=44180")
     def test_source_map(self):

diff  --git a/lldb/test/API/functionalities/signal/TestSendSignal.py b/lldb/test/API/functionalities/signal/TestSendSignal.py
index 88caa2daaf42e..5808ca17e566c 100644
--- a/lldb/test/API/functionalities/signal/TestSendSignal.py
+++ b/lldb/test/API/functionalities/signal/TestSendSignal.py
@@ -10,8 +10,6 @@
 
 class SendSignalTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py b/lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py
index d4b377bc14666..fd35e1d986eb3 100644
--- a/lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py
+++ b/lldb/test/API/functionalities/signal/handle-abrt/TestHandleAbort.py
@@ -11,8 +11,6 @@
 
 class HandleAbortTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows  # signals do not exist on Windows

diff  --git a/lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py
index 3cd7cbb5ce146..9802c4e33e4a1 100644
--- a/lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py
+++ b/lldb/test/API/functionalities/signal/handle-segv/TestHandleSegv.py
@@ -11,8 +11,6 @@
 
 class HandleSegvTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows  # signals do not exist on Windows
     @skipIfDarwin
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/signal/raise/TestRaise.py b/lldb/test/API/functionalities/signal/raise/TestRaise.py
index dd7e9af58787e..eea97fabee40c 100644
--- a/lldb/test/API/functionalities/signal/raise/TestRaise.py
+++ b/lldb/test/API/functionalities/signal/raise/TestRaise.py
@@ -12,8 +12,6 @@
 
 @skipIfWindows  # signals do not exist on Windows
 class RaiseTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNetBSD  # Hangs on NetBSD

diff  --git a/lldb/test/API/functionalities/source-map/TestTargetSourceMap.py b/lldb/test/API/functionalities/source-map/TestTargetSourceMap.py
index fcec6c88cbc97..129365abbf215 100644
--- a/lldb/test/API/functionalities/source-map/TestTargetSourceMap.py
+++ b/lldb/test/API/functionalities/source-map/TestTargetSourceMap.py
@@ -6,8 +6,6 @@
 
 class TestTargetSourceMap(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_source_map(self):
         """Test target.source-map' functionality."""

diff  --git a/lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py b/lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py
index 80e5a4ea6948a..bfc0186ec4c40 100644
--- a/lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py
+++ b/lldb/test/API/functionalities/stats_api/TestStatisticsAPI.py
@@ -8,7 +8,6 @@
 
 
 class TestStatsAPI(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     NO_DEBUG_INFO_TESTCASE = True
 

diff  --git a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index e8a95308797ea..9c72b0f03f791 100644
--- a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
@@ -13,8 +13,6 @@
 
 class StepAvoidsNoDebugTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     def test_step_out_with_python(self):
         """Test stepping out using avoid-no-debug with dsyms."""

diff  --git a/lldb/test/API/functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py b/lldb/test/API/functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py
index b3f8b3d7207d2..ee2dc620b70ac 100644
--- a/lldb/test/API/functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py
+++ b/lldb/test/API/functionalities/step-vrs-interrupt/TestStepVrsInterruptTimeout.py
@@ -10,8 +10,6 @@
 
 class TestStepVrsInterruptTimeout(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_step_vrs_interrupt(self):

diff  --git a/lldb/test/API/functionalities/step_scripted/TestStepScripted.py b/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
index 3aab76ea0e5b2..189c792edf5e9 100644
--- a/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
+++ b/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
@@ -9,8 +9,6 @@
 
 class StepScriptedTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py b/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
index 878e8694cb13a..b6af63505aff1 100644
--- a/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
+++ b/lldb/test/API/functionalities/stop-on-sharedlibrary-load/TestStopOnSharedlibraryEvents.py
@@ -6,8 +6,6 @@
 
 class TestStopOnSharedlibraryEvents(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     @skipIfWindows
     @no_debug_info_test

diff  --git a/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py
index 45346a42c2370..ee87f5f67a7bf 100644
--- a/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py
+++ b/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py
@@ -10,8 +10,6 @@
 
 class TestCrossDSOTailCalls(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py
index 48e1c86d42bdb..0249a0490eeaa 100644
--- a/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py
+++ b/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py
@@ -10,8 +10,6 @@
 
 class TestCrossObjectTailCalls(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py
index 456c0593cf1ea..34abff88008b6 100644
--- a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py
+++ b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py
@@ -8,7 +8,6 @@
 from lldbsuite.test.lldbtest import *
 
 class TestTailCallFrameSBAPI(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(compiler="clang", compiler_version=['<', '10.0'])
     @skipIf(dwarf_version=['<', '4'])

diff  --git a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py
index ec89fa7ed2719..987de0be51762 100644
--- a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py
+++ b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_or_return/TestSteppingOutWithArtificialFrames.py
@@ -8,7 +8,6 @@
 from lldbsuite.test.lldbtest import *
 
 class TestArtificialFrameThreadStepOut1(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for

diff  --git a/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py b/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
index cda0d283dd402..06169b041d374 100644
--- a/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
+++ b/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
@@ -12,8 +12,6 @@
 from lldbsuite.test import lldbutil
 
 class ModuleLoadedNotifysTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # At least DynamicLoaderDarwin and DynamicLoaderPOSIXDYLD should batch up

diff  --git a/lldb/test/API/functionalities/target_var/TestTargetVar.py b/lldb/test/API/functionalities/target_var/TestTargetVar.py
index 4eee0e61816e4..db8c92ae01db4 100644
--- a/lldb/test/API/functionalities/target_var/TestTargetVar.py
+++ b/lldb/test/API/functionalities/target_var/TestTargetVar.py
@@ -10,8 +10,6 @@
 
 class targetCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @skipIfDarwinEmbedded           # needs x86_64
     @skipIf(debug_info="gmodules")  # not relevant

diff  --git a/lldb/test/API/functionalities/target_var/no_vars/TestTargetVarNoVars.py b/lldb/test/API/functionalities/target_var/no_vars/TestTargetVarNoVars.py
index 60ca8b1252b35..0592cd539fe29 100644
--- a/lldb/test/API/functionalities/target_var/no_vars/TestTargetVarNoVars.py
+++ b/lldb/test/API/functionalities/target_var/no_vars/TestTargetVarNoVars.py
@@ -10,8 +10,6 @@
 
 class TestTargetVarNoVars(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_target_var_no_vars(self):

diff  --git a/lldb/test/API/functionalities/testid/TestTestId.py b/lldb/test/API/functionalities/testid/TestTestId.py
index b3d331773f81f..48d23e7096e16 100644
--- a/lldb/test/API/functionalities/testid/TestTestId.py
+++ b/lldb/test/API/functionalities/testid/TestTestId.py
@@ -9,8 +9,6 @@ class TestIdTestCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_id_exists(self):
         self.assertIsNotNone(self.id(), "Test instance should have an id()")
 

diff  --git a/lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py b/lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py
index 6dbb3e30ee728..3f346a0477081 100644
--- a/lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py
+++ b/lldb/test/API/functionalities/thread/backtrace_limit/TestBacktraceLimit.py
@@ -10,8 +10,6 @@
 
 
 class BacktraceLimitSettingTest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_backtrace_depth(self):

diff  --git a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index 4dc90cd16be0e..a9e9f093b9137 100644
--- a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
@@ -12,8 +12,6 @@
 
 class BreakpointAfterJoinTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py
index e265f095a93b3..18baa1b5a642e 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointDelayBreakpointOneSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentBreakpointDelayBreakpointOneSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py
index 422ac24b45818..add8afeaebb6b 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointOneDelayBreakpointThreads.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentBreakpointOneDelayBreakpointThreads(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py
index 68fc4a98f4466..d3f0162bb904c 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentBreakpointsDelayedBreakpointOneWatchpoint.py
@@ -10,8 +10,6 @@
 class ConcurrentBreakpointsDelayedBreakpointOneWatchpoint(
         ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py
index 694562998f8a2..141e332781edf 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentCrashWithBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py
index 49aeb191f9835..4cd961cba032e 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentCrashWithSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py
index 424e62cbc9adf..79557c6004db1 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentCrashWithWatchpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py
index c5e73bda7d88b..af07cf97cb447 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentCrashWithWatchpointBreakpointSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentCrashWithWatchpointBreakpointSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py
index 58d06dfea86ff..4f7d920d7b4b5 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentDelaySignalBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py
index ffb8e825d0d20..d17f8288c48c2 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelaySignalWatch.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentDelaySignalWatch(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py
index c4feb3b8f488a..ba648b87ea8d0 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayWatchBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentDelayWatchBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py
index 3de34331bbc7a..00ed22062c14f 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentDelayedCrashWithBreakpointSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py
index dce6e93793dc7..bd04a24983086 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentDelayedCrashWithBreakpointWatchpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentDelayedCrashWithBreakpointWatchpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
index 904c06cc0126d..5300492261de6 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentManyBreakpoints(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIfOutOfTreeDebugserver

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
index a5990929e33fe..f3f897409446a 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentManyCrash(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIfOutOfTreeDebugserver

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
index 85e07fcf5e61e..d5fe0efbf0b08 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManySignals.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentManySignals(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     # This test is flaky on Darwin.

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
index e466b17633da3..cd82dab827560 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py
@@ -8,8 +8,6 @@
 @skipIfWindows
 class ConcurrentManyWatchpoints(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py
index d6848de5fd319..0dab66598eaca 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentNWatchNBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentNWatchNBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureAll(archs=["aarch64"], oslist=["freebsd"],

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py
index 2ded95428a18a..f4ccd9efa59ba 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     def test(self):

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py
index ed633e628797d..ece11b4a43560 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalDelayBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFlakeyNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py
index 3207cb4b0ea62..4629a7fe90851 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalDelayWatch.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalDelayWatch(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py
index 8409984c67ffa..2478a49de4e38 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalNWatchNBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalNWatchNBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py
index ac9442cd25c07..2922070f9da6d 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatch.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalWatch(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py
index 2e18c15f5ab02..3ca3a8661c016 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentSignalWatchBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentSignalWatchBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py
index 70c474566506d..d56ce0c283513 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointThreads.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoBreakpointThreads(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureAll(archs=["aarch64"], oslist=["freebsd"],

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py
index 6375d795ab498..789a788bb484d 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneDelaySignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoBreakpointsOneDelaySignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFlakeyNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
index 688d4ded04dd5..fc7f80bde28ba 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoBreakpointsOneSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFlakeyNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py
index 54a8e09f5037c..bbd0e905b5717 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoBreakpointsOneWatchpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoBreakpointsOneWatchpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py
index 9a7088bbc3a9f..5cddeee587481 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointThreads.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoWatchpointThreads(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py
index 3eb9f30d8cf91..c83862d25d50a 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneBreakpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoWatchpointsOneBreakpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py
index c48e39554324c..f1b65220a091a 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneDelayBreakpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoWatchpointsOneDelayBreakpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @skipIf(

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py
index 8aea699a46346..acc08e1dd0772 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentTwoWatchpointsOneSignal.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentTwoWatchpointsOneSignal(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py
index 0de70ca69c8c5..7d3a759e09cee 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreak.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentWatchBreak(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py
index 32c3f00c03972..04ea9693fb5df 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchBreakDelay.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentWatchBreakDelay(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py
index b3db954de4ead..ebee04445299f 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointDelayWatchpointOneBreakpoint.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentWatchpointDelayWatchpointOneBreakpoint(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py
index c3205d6c49935..f724fac707447 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/TestConcurrentWatchpointWithDelayWatchpointThreads.py
@@ -9,8 +9,6 @@
 @skipIfWindows
 class ConcurrentWatchpointWithDelayWatchpointThreads(ConcurrentEventsBase):
 
-    mydir = ConcurrentEventsBase.compute_mydir(__file__)
-
     # Atomic sequences are not supported yet for MIPS in LLDB.
     @skipIf(triple='^mips')
     @add_test_categories(["watchpoint"])

diff  --git a/lldb/test/API/functionalities/thread/concurrent_events/exit/TestConcurrentThreadExit.py b/lldb/test/API/functionalities/thread/concurrent_events/exit/TestConcurrentThreadExit.py
index 63ff28026e4c2..276c6236124cb 100644
--- a/lldb/test/API/functionalities/thread/concurrent_events/exit/TestConcurrentThreadExit.py
+++ b/lldb/test/API/functionalities/thread/concurrent_events/exit/TestConcurrentThreadExit.py
@@ -10,8 +10,6 @@
 
 
 class ConcurrentThreadExitTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(oslist=no_match(["linux"]))

diff  --git a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index e371cd74fa038..4e259bd015ee4 100644
--- a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
@@ -12,8 +12,6 @@
 
 class CrashDuringStepTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.breakpoint = line_number('main.cpp', '// Set breakpoint here')

diff  --git a/lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
index efa3d9348b27c..39e7689c5c4f9 100644
--- a/lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
+++ b/lldb/test/API/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
@@ -12,8 +12,6 @@
 
 class CreateAfterAttachTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py
index dc67afc55f9e1..372ac139df21d 100644
--- a/lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/lldb/test/API/functionalities/thread/create_during_step/TestCreateDuringStep.py
@@ -12,8 +12,6 @@
 
 class CreateDuringStepTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="llvm.org/pr15824 thread states not properly maintained")

diff  --git a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index 16baf15a4d2a1..ed726372e094b 100644
--- a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
@@ -12,8 +12,6 @@
 
 class ExitDuringBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/exit_during_expression/TestExitDuringExpression.py b/lldb/test/API/functionalities/thread/exit_during_expression/TestExitDuringExpression.py
index 031ba14ba1837..5c8a21adf843f 100644
--- a/lldb/test/API/functionalities/thread/exit_during_expression/TestExitDuringExpression.py
+++ b/lldb/test/API/functionalities/thread/exit_during_expression/TestExitDuringExpression.py
@@ -10,8 +10,6 @@
 
 class TestExitDuringExpression(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows

diff  --git a/lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py
index a289777379859..b9be2c83d7918 100644
--- a/lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py
+++ b/lldb/test/API/functionalities/thread/exit_during_step/TestExitDuringStep.py
@@ -12,8 +12,6 @@
 
 class ExitDuringStepTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # This is flakey on Windows: llvm.org/pr38373
     def test(self):
         """Test thread exit during step handling."""

diff  --git a/lldb/test/API/functionalities/thread/ignore_suspended/TestIgnoreSuspendedThread.py b/lldb/test/API/functionalities/thread/ignore_suspended/TestIgnoreSuspendedThread.py
index cf9be237efaf6..e16ae6acd13ed 100644
--- a/lldb/test/API/functionalities/thread/ignore_suspended/TestIgnoreSuspendedThread.py
+++ b/lldb/test/API/functionalities/thread/ignore_suspended/TestIgnoreSuspendedThread.py
@@ -9,8 +9,6 @@
 
 
 class IgnoreSuspendedThreadTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
index 44bef6bf9de3a..c9dc4ed6a24d0 100644
--- a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
@@ -12,8 +12,6 @@
 
 class ThreadJumpTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test thread jump handling."""
         self.build()

diff  --git a/lldb/test/API/functionalities/thread/main_thread_exit/TestMainThreadExit.py b/lldb/test/API/functionalities/thread/main_thread_exit/TestMainThreadExit.py
index adee1afb83928..50060dd242f8c 100644
--- a/lldb/test/API/functionalities/thread/main_thread_exit/TestMainThreadExit.py
+++ b/lldb/test/API/functionalities/thread/main_thread_exit/TestMainThreadExit.py
@@ -10,8 +10,6 @@
 
 
 class ThreadExitTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # Needs os-specific implementation in the inferior

diff  --git a/lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py
index 61cdc882501b1..e03b9a50e33ea 100644
--- a/lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py
+++ b/lldb/test/API/functionalities/thread/multi_break/TestMultipleBreakpoints.py
@@ -12,8 +12,6 @@
 
 class MultipleBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py b/lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py
index ad476adeb718a..7ddf6f21f61f7 100644
--- a/lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py
+++ b/lldb/test/API/functionalities/thread/num_threads/TestNumThreads.py
@@ -11,8 +11,6 @@
 
 
 class NumberOfThreadsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/functionalities/thread/state/TestThreadStates.py b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
index 18586c47e7803..4c5ebcdc7791f 100644
--- a/lldb/test/API/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
@@ -13,8 +13,6 @@
 
 class ThreadStateTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="llvm.org/pr15824 thread states not properly maintained")

diff  --git a/lldb/test/API/functionalities/thread/state_after_expression/TestStateAfterExpression.py b/lldb/test/API/functionalities/thread/state_after_expression/TestStateAfterExpression.py
index a24058ba8f1f0..e26e066ce63bc 100644
--- a/lldb/test/API/functionalities/thread/state_after_expression/TestStateAfterExpression.py
+++ b/lldb/test/API/functionalities/thread/state_after_expression/TestStateAfterExpression.py
@@ -12,8 +12,6 @@
 
 class TestStopReasonAfterExpression(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr48415")
     @expectedFlakeyNetBSD

diff  --git a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
index 7c18643294566..38608d7a4f293 100644
--- a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py
@@ -12,8 +12,6 @@
 
 class ThreadStepOutTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # This test will hang on windows llvm.org/pr21753
     @expectedFailureAll(oslist=["windows"])
     @expectedFailureNetBSD

diff  --git a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
index dd48ebaf8e1af..0145b34f31de5 100644
--- a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
+++ b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
@@ -10,8 +10,6 @@
 
 class StepUntilTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py
index dcc0928d7b2ed..4f8951fe08bfc 100644
--- a/lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py
+++ b/lldb/test/API/functionalities/thread/thread_exit/TestThreadExit.py
@@ -12,8 +12,6 @@
 
 class ThreadExitTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
index a8fa0a58e4d5e..521e56109ea38 100644
--- a/lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
+++ b/lldb/test/API/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
@@ -21,8 +21,6 @@ def set_thread_name(test, thread, breakpoint):
     breakpoint.SetThreadName("main-thread")
 
 class ThreadSpecificBreakTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])

diff  --git a/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py b/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py
index 697124003048c..bf9703eedc654 100644
--- a/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py
+++ b/lldb/test/API/functionalities/thread/thread_specific_break_plus_condition/TestThreadSpecificBpPlusCondition.py
@@ -13,8 +13,6 @@
 
 class ThreadSpecificBreakPlusConditionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # test frequently times out or hangs
     @skipIfDarwin
     # hits break in another thread in testrun

diff  --git a/lldb/test/API/functionalities/thread_plan/TestThreadPlanCommands.py b/lldb/test/API/functionalities/thread_plan/TestThreadPlanCommands.py
index 2b713a9e280f2..8e38c5b28d0e7 100644
--- a/lldb/test/API/functionalities/thread_plan/TestThreadPlanCommands.py
+++ b/lldb/test/API/functionalities/thread_plan/TestThreadPlanCommands.py
@@ -12,8 +12,6 @@
 
 class TestThreadPlanCommands(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows

diff  --git a/lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py b/lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py
index 17684050572ba..9f7e5e4266c6f 100644
--- a/lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py
+++ b/lldb/test/API/functionalities/tsan/basic/TestTsanBasic.py
@@ -11,8 +11,6 @@
 
 class TsanBasicTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py b/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py
index 407126d01d31f..76f70467c6c10 100644
--- a/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py
+++ b/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py
@@ -11,8 +11,6 @@
 
 class TsanCPPGlobalLocationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py b/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py
index 7bfd90b0af3e0..793e2b156a7ad 100644
--- a/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py
+++ b/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py
@@ -11,8 +11,6 @@
 
 class TsanGlobalLocationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py b/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py
index 1938dc621fabb..1eefa48f29a55 100644
--- a/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py
+++ b/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py
@@ -11,8 +11,6 @@
 
 class TsanMultipleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py b/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py
index 09704e40cd3ae..0ff9e9aba4053 100644
--- a/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py
+++ b/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py
@@ -10,8 +10,6 @@
 
 class TsanThreadLeakTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py b/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py
index 80108cb7c1a8e..29c85ab23bbde 100644
--- a/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py
+++ b/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py
@@ -11,8 +11,6 @@
 
 class TsanThreadNumbersTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")

diff  --git a/lldb/test/API/functionalities/tty/TestTerminal.py b/lldb/test/API/functionalities/tty/TestTerminal.py
index a89ef3865cdf7..57da57f5c4eb2 100644
--- a/lldb/test/API/functionalities/tty/TestTerminal.py
+++ b/lldb/test/API/functionalities/tty/TestTerminal.py
@@ -15,8 +15,6 @@
 
 class LaunchInTerminalTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Darwin is the only platform that I know of that supports optionally launching
     # a program in a separate terminal window. It would be great if other platforms
     # added support for this.

diff  --git a/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py b/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
index 27fe5b5950ac8..b4ec209d4e679 100644
--- a/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
+++ b/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
@@ -11,8 +11,6 @@
 
 class TestTypeGetModule(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def find_module(self, target, name):
         num_modules = target.GetNumModules()
         index = 0

diff  --git a/lldb/test/API/functionalities/type_lookup/TestTypeLookup.py b/lldb/test/API/functionalities/type_lookup/TestTypeLookup.py
index 2257fd63063bf..8f553933e00a4 100644
--- a/lldb/test/API/functionalities/type_lookup/TestTypeLookup.py
+++ b/lldb/test/API/functionalities/type_lookup/TestTypeLookup.py
@@ -12,8 +12,6 @@
 
 class TypeLookupTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py b/lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
index 038b37b57d568..4220a597b048c 100644
--- a/lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
+++ b/lldb/test/API/functionalities/ubsan/basic/TestUbsanBasic.py
@@ -12,8 +12,6 @@
 
 class UbsanBasicTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessUndefinedBehaviorSanitizer
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py b/lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py
index bb1607dd43220..81f4bdc0b9b83 100644
--- a/lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py
+++ b/lldb/test/API/functionalities/ubsan/user-expression/TestUbsanUserExpression.py
@@ -10,8 +10,6 @@
 
 class UbsanUserExpressionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessUndefinedBehaviorSanitizer
     def test(self):
         self.build()

diff  --git a/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py b/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
index 593773a600698..2b4cbf7ce7f4e 100644
--- a/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
+++ b/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
@@ -8,7 +8,6 @@
 
 
 class TestUnusedInlinedParameters(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_unused_inlined_parameters(self):
         self.build()

diff  --git a/lldb/test/API/functionalities/unwind/aarch64_unwind_pac/TestAArch64UnwindPAC.py b/lldb/test/API/functionalities/unwind/aarch64_unwind_pac/TestAArch64UnwindPAC.py
index 9b2faf7f1e78d..e63467d9a74f5 100644
--- a/lldb/test/API/functionalities/unwind/aarch64_unwind_pac/TestAArch64UnwindPAC.py
+++ b/lldb/test/API/functionalities/unwind/aarch64_unwind_pac/TestAArch64UnwindPAC.py
@@ -9,7 +9,6 @@
 
 
 class AArch64UnwindPAC(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(archs=no_match(["aarch64"]))
     @skipIf(oslist=no_match(['linux']))

diff  --git a/lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py b/lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py
index 905543ff769a8..db293a80ea65f 100644
--- a/lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py
+++ b/lldb/test/API/functionalities/unwind/ehframe/TestEhFrameUnwind.py
@@ -11,7 +11,6 @@
 
 
 class EHFrameBasedUnwind(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessPlatform(['linux'])
     @skipIf(archs=["aarch64", "arm", "i386", "i686"])

diff  --git a/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
index 1cc45ebcf08cf..1bcd75a96b408 100644
--- a/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
@@ -12,7 +12,6 @@
 
 
 class NoreturnUnwind(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIfWindows  # clang-cl does not support gcc style attributes.
     # clang does not preserve LR in noreturn functions, making unwinding impossible

diff  --git a/lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py b/lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py
index d242cb75fd8d9..1b536e1193a38 100644
--- a/lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py
+++ b/lldb/test/API/functionalities/unwind/noreturn/module-end/TestNoReturnModuleEnd.py
@@ -13,7 +13,6 @@
 
 class TestNoreturnModuleEnd(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIfLLVMTargetMissing("X86")
     def test(self):

diff  --git a/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
index 3ee86f786133f..e7d22964fc69a 100644
--- a/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
@@ -12,7 +12,6 @@
 
 
 class SigtrampUnwind(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     # On 
diff erent platforms the "_sigtramp" and "__kill" frames are likely to be 
diff erent.
     # This test could probably be adapted to run on linux/*bsd easily enough.

diff  --git a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
index b85a92e4a92f2..23c336a73b023 100644
--- a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
+++ b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
@@ -31,7 +31,6 @@
 
 
 class ZerothFrame(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test(self):
         """

diff  --git a/lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py
index fb9fd15238dce..103f9ad7778ec 100644
--- a/lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py
+++ b/lldb/test/API/functionalities/value_md5_crash/TestValueMD5Crash.py
@@ -12,8 +12,6 @@
 
 class ValueMD5CrashTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/functionalities/var_path/TestVarPath.py b/lldb/test/API/functionalities/var_path/TestVarPath.py
index 672747a862815..a516e8c9ae2e7 100644
--- a/lldb/test/API/functionalities/var_path/TestVarPath.py
+++ b/lldb/test/API/functionalities/var_path/TestVarPath.py
@@ -11,8 +11,6 @@
 
 class TestVarPath(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py b/lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py
index c722840b28f4f..3a952c0c6b1f5 100644
--- a/lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py
+++ b/lldb/test/API/functionalities/wrong_commands/TestWrongCommands.py
@@ -10,8 +10,6 @@
 
 class UnknownCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_ambiguous_command(self):
         command_interpreter = self.dbg.GetCommandInterpreter()

diff  --git a/lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py b/lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py
index 7d29d95291abd..830044eda43ec 100644
--- a/lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py
+++ b/lldb/test/API/iohandler/autosuggestion/TestAutosuggestion.py
@@ -14,8 +14,6 @@ def cursor_horizontal_abs(s):
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     ANSI_FAINT = "\x1b[2m"
     ANSI_RESET = "\x1b[0m"
     ANSI_RED = "\x1b[31m"

diff  --git a/lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py b/lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py
index 5d170317e9795..650aae69847d3 100644
--- a/lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py
+++ b/lldb/test/API/iohandler/completion/TestIOHandlerCompletion.py
@@ -11,8 +11,6 @@
 
 class IOHandlerCompletionTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/iohandler/resize/TestIOHandlerResize.py b/lldb/test/API/iohandler/resize/TestIOHandlerResize.py
index c1f303288d52e..5d3b54b4f73cc 100644
--- a/lldb/test/API/iohandler/resize/TestIOHandlerResize.py
+++ b/lldb/test/API/iohandler/resize/TestIOHandlerResize.py
@@ -11,8 +11,6 @@
 
 class IOHandlerCompletionTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/iohandler/resize/TestIOHandlerResizeNoEditline.py b/lldb/test/API/iohandler/resize/TestIOHandlerResizeNoEditline.py
index 724a4236a7c53..250a97f4d54f1 100644
--- a/lldb/test/API/iohandler/resize/TestIOHandlerResizeNoEditline.py
+++ b/lldb/test/API/iohandler/resize/TestIOHandlerResizeNoEditline.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfWindows
     def test_resize_no_editline(self):

diff  --git a/lldb/test/API/iohandler/sigint/TestIOHandlerPythonREPLSigint.py b/lldb/test/API/iohandler/sigint/TestIOHandlerPythonREPLSigint.py
index d98add7876ade..24b99da9629b0 100644
--- a/lldb/test/API/iohandler/sigint/TestIOHandlerPythonREPLSigint.py
+++ b/lldb/test/API/iohandler/sigint/TestIOHandlerPythonREPLSigint.py
@@ -11,8 +11,6 @@
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def start_python_repl(self):
         """ Starts up the embedded Python REPL."""
         self.launch()

diff  --git a/lldb/test/API/iohandler/sigint/TestProcessIOHandlerInterrupt.py b/lldb/test/API/iohandler/sigint/TestProcessIOHandlerInterrupt.py
index e4fe77de8f076..1dcf17112fb4a 100644
--- a/lldb/test/API/iohandler/sigint/TestProcessIOHandlerInterrupt.py
+++ b/lldb/test/API/iohandler/sigint/TestProcessIOHandlerInterrupt.py
@@ -11,8 +11,6 @@
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="clang", compiler_version=['<', '11.0'])
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"])
     def test(self):

diff  --git a/lldb/test/API/iohandler/stdio/TestIOHandlerProcessSTDIO.py b/lldb/test/API/iohandler/stdio/TestIOHandlerProcessSTDIO.py
index cdfe173827581..078c124983f77 100644
--- a/lldb/test/API/iohandler/stdio/TestIOHandlerProcessSTDIO.py
+++ b/lldb/test/API/iohandler/stdio/TestIOHandlerProcessSTDIO.py
@@ -4,8 +4,6 @@
 from lldbsuite.test.lldbpexpect import PExpectTest
 
 class TestIOHandlerProcessSTDIO(PExpectTest):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # PExpect uses many timeouts internally and doesn't play well

diff  --git a/lldb/test/API/iohandler/unicode/TestUnicode.py b/lldb/test/API/iohandler/unicode/TestUnicode.py
index 7d239341d59c9..39e9226a96e6e 100644
--- a/lldb/test/API/iohandler/unicode/TestUnicode.py
+++ b/lldb/test/API/iohandler/unicode/TestUnicode.py
@@ -12,8 +12,6 @@
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan

diff  --git a/lldb/test/API/lang/c/anonymous/TestAnonymous.py b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
index 42d280d660a91..762459e7d842a 100644
--- a/lldb/test/API/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
@@ -10,8 +10,6 @@
 
 class AnonymousTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(
         compiler="icc",
         bugnumber="llvm.org/pr15036: LLDB generates an incorrect AST layout for an anonymous struct when DWARF is generated by ICC")

diff  --git a/lldb/test/API/lang/c/array_types/TestArrayTypes.py b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
index 72eb5e15c5729..1ceee6838fd30 100644
--- a/lldb/test/API/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
@@ -10,8 +10,6 @@
 
 class ArrayTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/bitfields/TestBitfields.py b/lldb/test/API/lang/c/bitfields/TestBitfields.py
index 4a144d5e80c65..dc54a45034eef 100644
--- a/lldb/test/API/lang/c/bitfields/TestBitfields.py
+++ b/lldb/test/API/lang/c/bitfields/TestBitfields.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def run_to_main(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.c"))

diff  --git a/lldb/test/API/lang/c/blocks/TestBlocks.py b/lldb/test/API/lang/c/blocks/TestBlocks.py
index 99ea22a69dd6e..8bfc5650a34e1 100644
--- a/lldb/test/API/lang/c/blocks/TestBlocks.py
+++ b/lldb/test/API/lang/c/blocks/TestBlocks.py
@@ -10,8 +10,6 @@
 
 
 class BlocksTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     lines = []
 
     def setUp(self):

diff  --git a/lldb/test/API/lang/c/builtin-types/TestCBuiltinTypes.py b/lldb/test/API/lang/c/builtin-types/TestCBuiltinTypes.py
index 634441196b93a..f2be203fa119d 100644
--- a/lldb/test/API/lang/c/builtin-types/TestCBuiltinTypes.py
+++ b/lldb/test/API/lang/c/builtin-types/TestCBuiltinTypes.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_FindTypes_on_scratch_AST(self):
         """

diff  --git a/lldb/test/API/lang/c/calling-conventions/TestCCallingConventions.py b/lldb/test/API/lang/c/calling-conventions/TestCCallingConventions.py
index d12431d043253..a93cba998431d 100644
--- a/lldb/test/API/lang/c/calling-conventions/TestCCallingConventions.py
+++ b/lldb/test/API/lang/c/calling-conventions/TestCCallingConventions.py
@@ -6,8 +6,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def build_and_run(self, test_file):

diff  --git a/lldb/test/API/lang/c/complex/TestComplexC99.py b/lldb/test/API/lang/c/complex/TestComplexC99.py
index 93ad8f0ec0818..6ed1ae8ef2f99 100644
--- a/lldb/test/API/lang/c/complex/TestComplexC99.py
+++ b/lldb/test/API/lang/c/complex/TestComplexC99.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfWindows
     def test(self):

diff  --git a/lldb/test/API/lang/c/complex_int/TestComplexInt.py b/lldb/test/API/lang/c/complex_int/TestComplexInt.py
index 86916ea8d5be3..40e3c90933b58 100644
--- a/lldb/test/API/lang/c/complex_int/TestComplexInt.py
+++ b/lldb/test/API/lang/c/complex_int/TestComplexInt.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfWindows
     def test(self):

diff  --git a/lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py b/lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
index a66f3bbd1f77a..3ba79908de97f 100644
--- a/lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
+++ b/lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
@@ -9,8 +9,6 @@
 
 
 class TestConflictingSymbols(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/lang/c/const_variables/TestConstVariables.py b/lldb/test/API/lang/c/const_variables/TestConstVariables.py
index 828bcf136934f..b700b958b08b7 100644
--- a/lldb/test/API/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/test/API/lang/c/const_variables/TestConstVariables.py
@@ -10,8 +10,6 @@
 
 class ConstVariableTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["freebsd", "linux"], compiler="icc")
     @expectedFailureAll(archs=['mips', 'mipsel', 'mips64', 'mips64el'])
     @expectedFailureAll(

diff  --git a/lldb/test/API/lang/c/cpp_keyword_identifiers/TestCppKeywordsAsCIdentifiers.py b/lldb/test/API/lang/c/cpp_keyword_identifiers/TestCppKeywordsAsCIdentifiers.py
index 54cb1c8b15268..92023c7fceeb9 100644
--- a/lldb/test/API/lang/c/cpp_keyword_identifiers/TestCppKeywordsAsCIdentifiers.py
+++ b/lldb/test/API/lang/c/cpp_keyword_identifiers/TestCppKeywordsAsCIdentifiers.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # FIXME: Clang on Windows somehow thinks static_assert is a C keyword.
     @skipIfWindows
     @no_debug_info_test

diff  --git a/lldb/test/API/lang/c/enum_types/TestEnumTypes.py b/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
index fca85ac2663b4..937c720272f90 100644
--- a/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
@@ -10,8 +10,6 @@
 
 class EnumTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py b/lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py
index dcde84b3b7ec0..8ebe7f79d0f9d 100644
--- a/lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py
+++ b/lldb/test/API/lang/c/find_struct_type/TestFindStructTypes.py
@@ -11,8 +11,6 @@
 
 class TestFindTypesOnStructType(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py b/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py
index b866786634058..459fcdd5085ce 100644
--- a/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py
+++ b/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
index 70c60ebdd64d1..ca5817b014592 100644
--- a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
@@ -10,8 +10,6 @@
 
 class ForwardDeclarationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def do_test(self, dictionary=None):
         """Display *bar_ptr when stopped on a function with forward declaration of struct bar."""
         self.build(dictionary=dictionary)

diff  --git a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
index 9288c6300e217..f378e44ba5e3f 100644
--- a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
@@ -10,8 +10,6 @@
 
 class FunctionTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
index cacdf18e11b94..f3668f9055351 100644
--- a/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
@@ -9,8 +9,6 @@
 
 class GlobalVariablesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/local_types/TestUseClosestType.py b/lldb/test/API/lang/c/local_types/TestUseClosestType.py
index 13a69a30aeafc..b9a84d3eae433 100644
--- a/lldb/test/API/lang/c/local_types/TestUseClosestType.py
+++ b/lldb/test/API/lang/c/local_types/TestUseClosestType.py
@@ -15,8 +15,6 @@
 
 class TestUseClosestType(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(bugnumber="<rdar://problem/53262085>")

diff  --git a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
index 1d3c90ea72713..6e9aa888501fd 100644
--- a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
+++ b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
@@ -14,8 +14,6 @@
 
 class LocalVariablesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/modules/TestCModules.py b/lldb/test/API/lang/c/modules/TestCModules.py
index 2ec6e9698ce4f..68e2b64702d62 100644
--- a/lldb/test/API/lang/c/modules/TestCModules.py
+++ b/lldb/test/API/lang/c/modules/TestCModules.py
@@ -12,8 +12,6 @@
 
 class CModulesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["freebsd", "linux"],
         bugnumber="http://llvm.org/pr23456 'fopen' has unknown return type")

diff  --git a/lldb/test/API/lang/c/record_decl_in_expr/TestRecordDeclInExpr.py b/lldb/test/API/lang/c/record_decl_in_expr/TestRecordDeclInExpr.py
index 16bf098dce8f3..f1b367990bdd1 100644
--- a/lldb/test/API/lang/c/record_decl_in_expr/TestRecordDeclInExpr.py
+++ b/lldb/test/API/lang/c/record_decl_in_expr/TestRecordDeclInExpr.py
@@ -8,8 +8,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_fwd_decl(self):
         # Declare a forward decl and import it to the scratch AST.

diff  --git a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
index c255056352c25..568debd098725 100644
--- a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
@@ -14,8 +14,6 @@ def re_expr_equals(val_type, val):
 
 class RegisterVariableTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(compiler="clang", compiler_version=['<', '3.5'])
     @expectedFailureAll(compiler="gcc", compiler_version=[
             '>=', '4.8.2'], archs=["i386"])

diff  --git a/lldb/test/API/lang/c/set_values/TestSetValues.py b/lldb/test/API/lang/c/set_values/TestSetValues.py
index b468eaf241f08..8febb08fd2b41 100644
--- a/lldb/test/API/lang/c/set_values/TestSetValues.py
+++ b/lldb/test/API/lang/c/set_values/TestSetValues.py
@@ -10,8 +10,6 @@
 
 class SetValuesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
index 36fbbb7c483f0..e7cbf1cd3157b 100644
--- a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
@@ -11,8 +11,6 @@
 
 class SharedLibTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def common_test_expr(self, preload_symbols):
         if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion():
             self.skipTest(

diff  --git a/lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index 3919f402f35cb..8a0a7e38c1978 100644
--- a/lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -11,8 +11,6 @@
 
 class SharedLibStrippedTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"])
     def test_expr(self):
         """Test that types work when defined in a shared library and forwa/d-declared in the main executable"""

diff  --git a/lldb/test/API/lang/c/sizeof/TestCSizeof.py b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
index 67766833623db..255025f0eab2c 100644
--- a/lldb/test/API/lang/c/sizeof/TestCSizeof.py
+++ b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         self.createTestTarget()

diff  --git a/lldb/test/API/lang/c/step-target/TestStepTarget.py b/lldb/test/API/lang/c/step-target/TestStepTarget.py
index 0b97f400be469..3521870ddbdca 100644
--- a/lldb/test/API/lang/c/step-target/TestStepTarget.py
+++ b/lldb/test/API/lang/c/step-target/TestStepTarget.py
@@ -9,8 +9,6 @@
 
 class TestStepTarget(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
index ad63ba87fa099..a3321fcb2cd95 100644
--- a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
+++ b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
@@ -13,8 +13,6 @@
 
 class StepOverDoesntDeadlockTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_step_over(self):
         """Test that when step over steps over a function it lets other threads run."""
         self.build()

diff  --git a/lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py
index b5dbb05b5ba85..62cce7181a340 100644
--- a/lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/test/API/lang/c/stepping/TestStepAndBreakpoints.py
@@ -10,8 +10,6 @@
 
 class TestCStepping(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py b/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
index 36588606b651e..a0f9c5429b528 100644
--- a/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
+++ b/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
@@ -12,8 +12,6 @@
 
 class ThreadStepInAvoidRegexTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.line2 = line_number('main.c', '// assignment to B2')

diff  --git a/lldb/test/API/lang/c/stepping/TestThreadStepping.py b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
index c134c95cf4851..a1320b6db1482 100644
--- a/lldb/test/API/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
@@ -11,8 +11,6 @@
 
 class ThreadSteppingTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/c/strings/TestCStrings.py b/lldb/test/API/lang/c/strings/TestCStrings.py
index 597a247178e49..bf74b47bad6a1 100644
--- a/lldb/test/API/lang/c/strings/TestCStrings.py
+++ b/lldb/test/API/lang/c/strings/TestCStrings.py
@@ -9,8 +9,6 @@
 
 class CStringsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Tests that C strings work as expected in expressions"""
         self.build()

diff  --git a/lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py
index b1fd2b8d03143..11db3e1d849a8 100644
--- a/lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py
@@ -12,8 +12,6 @@
 
 class TlsGlobalTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/lang/c/typedef/Testtypedef.py b/lldb/test/API/lang/c/typedef/Testtypedef.py
index 29a3c5af9e4a3..d11b1d6c9c911 100644
--- a/lldb/test/API/lang/c/typedef/Testtypedef.py
+++ b/lldb/test/API/lang/c/typedef/Testtypedef.py
@@ -10,8 +10,6 @@
 
 class TypedefTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(compiler="clang", bugnumber="llvm.org/pr19238")
     def test_typedef(self):
         """Test 'image lookup -t a' and check for correct display at 
diff erent scopes."""

diff  --git a/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py b/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
index 9eb25e4d1050b..59b42be6f5951 100644
--- a/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
+++ b/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
@@ -7,8 +7,6 @@
 
 class TestUnicodeSymbols(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="clang", compiler_version=['<', '7.0'])
     def test_union_members(self):
         self.build()

diff  --git a/lldb/test/API/lang/c/unions/TestUnionMembers.py b/lldb/test/API/lang/c/unions/TestUnionMembers.py
index e800b7cc61432..025301183ae16 100644
--- a/lldb/test/API/lang/c/unions/TestUnionMembers.py
+++ b/lldb/test/API/lang/c/unions/TestUnionMembers.py
@@ -5,8 +5,6 @@
 
 class TestUnionMembers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_union_members(self):
         self._load_exe()
 

diff  --git a/lldb/test/API/lang/c/vla/TestVLA.py b/lldb/test/API/lang/c/vla/TestVLA.py
index 758406d72e635..7d53e5dbd5b58 100644
--- a/lldb/test/API/lang/c/vla/TestVLA.py
+++ b/lldb/test/API/lang/c/vla/TestVLA.py
@@ -6,8 +6,6 @@
 
 class TestVLA(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="clang", compiler_version=['<', '8.0'])
     def test_variable_list(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py b/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py
index 83499d8f95f60..47d5f23bb4970 100644
--- a/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py
+++ b/lldb/test/API/lang/cpp/accelerator-table/TestCPPAccelerator.py
@@ -6,8 +6,6 @@
 
 class CPPAcceleratorTableTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @skipIf(debug_info=no_match(["dwarf"]))
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/alignas_base_class/TestAlignAsBaseClass.py b/lldb/test/API/lang/cpp/alignas_base_class/TestAlignAsBaseClass.py
index 25f37ab7fe5fa..20755a8c1c35e 100644
--- a/lldb/test/API/lang/cpp/alignas_base_class/TestAlignAsBaseClass.py
+++ b/lldb/test/API/lang/cpp/alignas_base_class/TestAlignAsBaseClass.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
index c5b656b9f1b4b..920eb2bef8c34 100644
--- a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
+++ b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
@@ -9,8 +9,6 @@
 
 class CPPAutoTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that auto types work in the expression parser"""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py b/lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
index 956ae275b337e..f38d0f6c7edf4 100644
--- a/lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
+++ b/lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
@@ -8,8 +8,6 @@
 
 class CppBitfieldsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_bitfields(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/bool/TestCPPBool.py b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
index bff3e86f54cfb..997f1a0b0456d 100644
--- a/lldb/test/API/lang/cpp/bool/TestCPPBool.py
+++ b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
@@ -8,8 +8,6 @@
 
 class CPPBoolTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that bool types work in the expression parser"""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py b/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
index 46846b49bb386..258ae588bc3e4 100644
--- a/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
+++ b/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
@@ -15,8 +15,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_breakpoints_on_initializers(self):
         """Show we can set breakpoints on initializers appearing both before
            and after the constructor body, and hit them."""

diff  --git a/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 8926492d2f225..1a6f94ed8f22c 100644
--- a/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
@@ -12,8 +12,6 @@
 
 class CPPBreakpointCommandsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def make_breakpoint(self, name, type, expected_num_locations):
         bkpt = self.target.BreakpointCreateByName(name,
                                                   type,

diff  --git a/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
index 41bb8673c3a06..f75e2e10c5723 100644
--- a/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
+++ b/lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
@@ -14,8 +14,6 @@
 
 class TestBreakpointInMemberFuncWNonPrimitiveParams(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["gmodules"])
     def test_breakpint_in_member_func_w_non_primitie_params(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
index 6924ad2f255f3..ce5b5643e0bcc 100644
--- a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
+++ b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
@@ -10,8 +10,6 @@
 
 class CallCPPFunctionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number('main.cpp', '// breakpoint')

diff  --git a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
index 1813a0f2a0025..9c6f1e0eb94f1 100644
--- a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
+++ b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
@@ -6,8 +6,6 @@
 
 class TestCppChainedCalls(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
index 182302987ca9b..6edde50dcbb61 100644
--- a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
@@ -13,8 +13,6 @@
 
 class Char1632TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
index 71dfdbc6e66bd..ed9f604198708 100644
--- a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
+++ b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
@@ -12,8 +12,6 @@
 
 class CxxChar8_tTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="clang", compiler_version=['<', '7.0'])
     @expectedFailureDarwin(archs=["arm64", "arm64e"]) # <rdar://problem/37773624>
     def test_without_process(self):

diff  --git a/lldb/test/API/lang/cpp/class-loading-via-member-typedef/TestClassLoadingViaMemberTypedef.py b/lldb/test/API/lang/cpp/class-loading-via-member-typedef/TestClassLoadingViaMemberTypedef.py
index 6d1a85fff7214..8e38876d9f9fd 100644
--- a/lldb/test/API/lang/cpp/class-loading-via-member-typedef/TestClassLoadingViaMemberTypedef.py
+++ b/lldb/test/API/lang/cpp/class-loading-via-member-typedef/TestClassLoadingViaMemberTypedef.py
@@ -12,8 +12,6 @@ class (and not via the normal LLDB lookup that first resolves the surrounding
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py b/lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py
index 469cdfbdc84a6..dac0c1066496a 100644
--- a/lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py
+++ b/lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py
@@ -5,8 +5,6 @@
 
 class TestCaseClassTemplateNonTypeParameterPack(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], archs=["i[3-6]86", "x86_64"]) # Fails to read memory from target.
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
index d452ae6a4272d..38b5a7c279a44 100644
--- a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
+++ b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py b/lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py
index 919b322f5148d..c8928cfb30475 100644
--- a/lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py
+++ b/lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py
@@ -5,8 +5,6 @@
 
 class TestCaseClassTemplateTypeParameterPack(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], archs=["i[3-6]86", "x86_64"]) # Fails to read memory from target.
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
index 5d1a79ed24128..8e11948bed28e 100644
--- a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
@@ -12,8 +12,6 @@
 
 class StaticVariableTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
index 6ea115352c127..a108bd8bd9e39 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
@@ -11,8 +11,6 @@
 
 class ClassTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
index 9f3d6806451e7..82a529494a680 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -14,8 +14,6 @@
 
 class IterateFrameAndDisassembleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_and_run_command(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/complete-type-check/TestCppIsTypeComplete.py b/lldb/test/API/lang/cpp/complete-type-check/TestCppIsTypeComplete.py
index 1059e03878010..b596611b15f2f 100644
--- a/lldb/test/API/lang/cpp/complete-type-check/TestCppIsTypeComplete.py
+++ b/lldb/test/API/lang/cpp/complete-type-check/TestCppIsTypeComplete.py
@@ -8,8 +8,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def assertComplete(self, typename):
         """ Asserts that the type with the given name is complete. """
         found_type = self.target().FindFirstType(typename)

diff  --git a/lldb/test/API/lang/cpp/const_this/TestConstThis.py b/lldb/test/API/lang/cpp/const_this/TestConstThis.py
index b6790ff36f649..4b7d3aadb62ab 100644
--- a/lldb/test/API/lang/cpp/const_this/TestConstThis.py
+++ b/lldb/test/API/lang/cpp/const_this/TestConstThis.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def run_class_tests(self):

diff  --git a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
index 611af25dc239e..d726108ab7411 100644
--- a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
+++ b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc")
     def test_constructors(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py b/lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py
index 0e889ead09b75..0f0d988467c30 100644
--- a/lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py
+++ b/lldb/test/API/lang/cpp/covariant-return-types/TestCovariantReturnTypes.py
@@ -3,8 +3,6 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/crtp/TestCppCRTP.py b/lldb/test/API/lang/cpp/crtp/TestCppCRTP.py
index f511ad75455a4..0fecbc8ba6fff 100644
--- a/lldb/test/API/lang/cpp/crtp/TestCppCRTP.py
+++ b/lldb/test/API/lang/cpp/crtp/TestCppCRTP.py
@@ -14,8 +14,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/default-template-args/TestDefaultTemplateArgs.py b/lldb/test/API/lang/cpp/default-template-args/TestDefaultTemplateArgs.py
index e009b23d5b636..709fccb4b3ce7 100644
--- a/lldb/test/API/lang/cpp/default-template-args/TestDefaultTemplateArgs.py
+++ b/lldb/test/API/lang/cpp/default-template-args/TestDefaultTemplateArgs.py
@@ -9,8 +9,6 @@
 
 class TestDefaultTemplateArgs(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
index 741fc6ed85e01..70aa97765e354 100644
--- a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
+++ b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Tests deferencing lvalue/rvalue references via LLDB's builtin type system."""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py b/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py
index 4a561be425775..811612bfcac4a 100644
--- a/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py
+++ b/lldb/test/API/lang/cpp/diamond/TestCppDiamond.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_with_sbvalue(self):
         """

diff  --git a/lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py b/lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
index 7af4db6c08e22..0248922cfc569 100644
--- a/lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
+++ b/lldb/test/API/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
@@ -12,8 +12,6 @@
 
 class DynamicValueSameBaseTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
index f37c33705f091..010a7e45525af 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -14,8 +14,6 @@
 
 class CppValueCastTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(bugnumber="llvm.org/PR36714")
     @add_test_categories(['pyapi'])
     def test_value_cast_with_virtual_inheritance(self):

diff  --git a/lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py
index f865211dd4f81..7ee15c72bbc66 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/test/API/lang/cpp/dynamic-value/TestDynamicValue.py
@@ -12,8 +12,6 @@
 
 class DynamicValueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/elaborated-types/TestElaboratedTypes.py b/lldb/test/API/lang/cpp/elaborated-types/TestElaboratedTypes.py
index 97670ec263e55..af2aabe6df2b9 100644
--- a/lldb/test/API/lang/cpp/elaborated-types/TestElaboratedTypes.py
+++ b/lldb/test/API/lang/cpp/elaborated-types/TestElaboratedTypes.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
index b0a52e1552a68..9065985030300 100644
--- a/lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -8,8 +8,6 @@
 
 class CPP11EnumTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_enum(self, suffix):
         """
         :param suffix The suffix of the enum type name (enum_<suffix>) that

diff  --git a/lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index 9014ced7673e0..9515c422e2740 100644
--- a/lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/test/API/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
@@ -12,8 +12,6 @@
 
 class CPPBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
index 86d2bffca98fc..37961a51f1021 100644
--- a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
+++ b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """
         Tests a forward declared template and a normal template in the same

diff  --git a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
index 6462896042f35..349ee8c24b902 100644
--- a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
+++ b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
@@ -8,8 +8,6 @@
 
 class FrameVariableAnonymousUnionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Tests that frame variable looks into anonymous unions"""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/function-local-class/TestCppFunctionLocalClass.py b/lldb/test/API/lang/cpp/function-local-class/TestCppFunctionLocalClass.py
index dfbbfb8ad04c5..53bfa7aa85f5e 100644
--- a/lldb/test/API/lang/cpp/function-local-class/TestCppFunctionLocalClass.py
+++ b/lldb/test/API/lang/cpp/function-local-class/TestCppFunctionLocalClass.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
index f7653164d1c37..bc3b6d156046d 100644
--- a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
+++ b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self,"// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
index 6d6ee0053caf8..2f7c7c872299c 100644
--- a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
+++ b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
@@ -9,8 +9,6 @@
 
 class TestCppGlobalOperators(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def prepare_executable_and_get_frame(self):
         self.build()
 

diff  --git a/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py b/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
index dbce44f340197..28e53a0da2842 100644
--- a/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
+++ b/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
@@ -9,8 +9,6 @@
 
 class GlobalVariablesCppTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = lldb.SBFileSpec('main.cpp')

diff  --git a/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py b/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py
index 53c30141286b8..d79a753f72484 100644
--- a/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py
+++ b/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py
@@ -7,8 +7,6 @@
 
 class TestWithGmodulesDebugInfo(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(bugnumber="llvm.org/pr36146", oslist=["linux"], archs=["i386"])
     @add_test_categories(["gmodules"])
     def test_specialized_typedef_from_pch(self):

diff  --git a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
index 61f87040bd0dc..11b2b95a40f70 100644
--- a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
+++ b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """
         Test debugging a binary that has two templates with the same name

diff  --git a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
index 6ebd67d26968d..226ab8f979bdf 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
@@ -6,8 +6,6 @@
 
 class TestCppIncompleteTypes(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="gcc")
     def test_limit_debug_info(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
index 4494b3737c473..c4fe248d81efe 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
@@ -11,8 +11,6 @@
 
 class TestCppIncompleteTypeMembers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(oslist=['darwin','macos'], debug_info="gmodules")
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/inlines/TestInlines.py b/lldb/test/API/lang/cpp/inlines/TestInlines.py
index 3184a53921ed7..8dd0acef7d4e4 100644
--- a/lldb/test/API/lang/cpp/inlines/TestInlines.py
+++ b/lldb/test/API/lang/cpp/inlines/TestInlines.py
@@ -9,8 +9,6 @@
 
 class InlinesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/keywords_enabled/TestCppKeywordsEnabled.py b/lldb/test/API/lang/cpp/keywords_enabled/TestCppKeywordsEnabled.py
index c7c15ecc8dd3f..e5f9097604f27 100644
--- a/lldb/test/API/lang/cpp/keywords_enabled/TestCppKeywordsEnabled.py
+++ b/lldb/test/API/lang/cpp/keywords_enabled/TestCppKeywordsEnabled.py
@@ -6,8 +6,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_keyword(self):
       # Make sure that C++ keywords work in the expression parser.

diff  --git a/lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py b/lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
index 03bb40271ab0a..0c6728b9f06a0 100644
--- a/lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
+++ b/lldb/test/API/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
@@ -6,8 +6,6 @@
 
 class TestWithLimitDebugInfo(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["dwarf", "dwo"])
     def test_limit_debug_info(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
index ac2b3b0171af6..77afa46d3deea 100644
--- a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
+++ b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
@@ -6,8 +6,6 @@
 
 class TestMembersAndLocalsWithSameName(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_when_stopped_in_method(self):
         self._load_exe()
 

diff  --git a/lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py b/lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py
index 58a5fa2aeea33..7c760df2a40c0 100644
--- a/lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py
+++ b/lldb/test/API/lang/cpp/modules-import/TestCXXModulesImport.py
@@ -12,8 +12,6 @@
 
 class CXXModulesImportTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def build(self):
         include = self.getBuildArtifact('include')
         lldbutil.mkdir_p(include)

diff  --git a/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py b/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
index bc2b7a5f95b07..573a6626053f2 100644
--- a/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
+++ b/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/lang/cpp/namespace/TestNamespace.py b/lldb/test/API/lang/cpp/namespace/TestNamespace.py
index 87d9a25786398..af6568ccc9297 100644
--- a/lldb/test/API/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/test/API/lang/cpp/namespace/TestNamespace.py
@@ -12,8 +12,6 @@
 
 class NamespaceBreakpointTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(bugnumber="llvm.org/pr28548", compiler="gcc")
     @expectedFailureAll(oslist=["windows"])
     def test_breakpoints_func_auto(self):
@@ -99,8 +97,6 @@ def test_breakpoints_a_func_full(self):
 
 class NamespaceTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
index 5761ab7ef1705..3a27278beae84 100644
--- a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
@@ -12,8 +12,6 @@
 
 class NamespaceLookupTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py b/lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
index a82c28f19ad44..2572f3985bc50 100644
--- a/lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
+++ b/lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
@@ -11,8 +11,6 @@
 
 class NamespaceDefinitionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # See also llvm.org/pr28948
     @expectedFailureAll(
         bugnumber="llvm.org/pr50814",

diff  --git a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
index 5b590d6363ab3..fc3221a29d1f7 100644
--- a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
+++ b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
@@ -9,7 +9,6 @@
 
 
 class TestNestedClassWithParentInAnotherCU(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_nested_class_with_parent_in_another_cu(self):
         self.main_source_file = lldb.SBFileSpec("main.cpp")

diff  --git a/lldb/test/API/lang/cpp/non-type-template-param/TestCppNonTypeTemplateParam.py b/lldb/test/API/lang/cpp/non-type-template-param/TestCppNonTypeTemplateParam.py
index 4db94dae20acd..71ba9b2b2f1ea 100644
--- a/lldb/test/API/lang/cpp/non-type-template-param/TestCppNonTypeTemplateParam.py
+++ b/lldb/test/API/lang/cpp/non-type-template-param/TestCppNonTypeTemplateParam.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py b/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
index 8aa9b28b32ca1..74c9a46622966 100644
--- a/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
+++ b/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
@@ -9,8 +9,6 @@
 
 class TestCppNsImport(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Tests imported namespaces in C++."""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
index c361a3916fb21..096cd3ab6f2d8 100644
--- a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
+++ b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestOperatorOverload(TestBase):
-  mydir = TestBase.compute_mydir(__file__)
 
   def test_overload(self):
     self.build()

diff  --git a/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
index 60207b1978f1b..ddc6a92d1bfc6 100644
--- a/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
+++ b/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
@@ -10,8 +10,6 @@
 
 class OverloadedFunctionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that functions with the same name are resolved correctly"""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/pointer_to_member_type_depending_on_parent_size/TestPointerToMemberTypeDependingOnParentSize.py b/lldb/test/API/lang/cpp/pointer_to_member_type_depending_on_parent_size/TestPointerToMemberTypeDependingOnParentSize.py
index cd8977c3a2e11..b67b32f130b75 100644
--- a/lldb/test/API/lang/cpp/pointer_to_member_type_depending_on_parent_size/TestPointerToMemberTypeDependingOnParentSize.py
+++ b/lldb/test/API/lang/cpp/pointer_to_member_type_depending_on_parent_size/TestPointerToMemberTypeDependingOnParentSize.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # GCC rejects the test code because `ToLayout` is not complete when
     # pointer_to_member_member is declared.
     @skipIf(compiler="gcc")

diff  --git a/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py b/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
index f9ba26ab32bab..9074df8538b9e 100644
--- a/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
+++ b/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailure("The fix for this was reverted due to llvm.org/PR52257")
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
index 5e31d93eb1635..d4ae1327e6ac6 100644
--- a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
+++ b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
@@ -10,8 +10,6 @@
 
 class RvalueReferencesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # rdar://problem/11479676
     @expectedFailureAll(
         compiler="icc",

diff  --git a/lldb/test/API/lang/cpp/scope/TestCppScope.py b/lldb/test/API/lang/cpp/scope/TestCppScope.py
index a61f9488e2151..dcc3e6d2e9d60 100644
--- a/lldb/test/API/lang/cpp/scope/TestCppScope.py
+++ b/lldb/test/API/lang/cpp/scope/TestCppScope.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/scratch-context-merging/structs/TestCppScratchContextMergingStructs.py b/lldb/test/API/lang/cpp/scratch-context-merging/structs/TestCppScratchContextMergingStructs.py
index 5cd51d671090a..958c4693af560 100644
--- a/lldb/test/API/lang/cpp/scratch-context-merging/structs/TestCppScratchContextMergingStructs.py
+++ b/lldb/test/API/lang/cpp/scratch-context-merging/structs/TestCppScratchContextMergingStructs.py
@@ -17,8 +17,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def common_setup(self):
         self.build()
         lldbutil.run_to_source_breakpoint(

diff  --git a/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
index b7ae201a9d15c..e94dabe7ac48f 100644
--- a/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
@@ -12,8 +12,6 @@
 
 class SignedTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
index e7f4623ee91f2..dc7bc5f898975 100644
--- a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
+++ b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         self.createTestTarget()

diff  --git a/lldb/test/API/lang/cpp/static_member_type_depending_on_parent_size/TestStaticMemberTypeDependingOnParentSize.py b/lldb/test/API/lang/cpp/static_member_type_depending_on_parent_size/TestStaticMemberTypeDependingOnParentSize.py
index ceeef9a496cc6..856a7aca22b78 100644
--- a/lldb/test/API/lang/cpp/static_member_type_depending_on_parent_size/TestStaticMemberTypeDependingOnParentSize.py
+++ b/lldb/test/API/lang/cpp/static_member_type_depending_on_parent_size/TestStaticMemberTypeDependingOnParentSize.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         """

diff  --git a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
index 35e29cc97090c..b698f2283f294 100644
--- a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
@@ -13,8 +13,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # We fail to lookup static members on Windows.
     @expectedFailureAll(oslist=["windows"])
     def test_access_from_main(self):

diff  --git a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
index ee4cc60df97fc..c974da4e1771c 100644
--- a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
+++ b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
@@ -10,8 +10,6 @@
 
 class CPPStaticMethodsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that static methods are properly distinguished from regular methods"""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py b/lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
index d667321493e91..498e107b5b3f6 100644
--- a/lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
+++ b/lldb/test/API/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
@@ -12,8 +12,6 @@
 
 class LibCxxFunctionSteppingIntoCallableTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(["libc++"])

diff  --git a/lldb/test/API/lang/cpp/stl/TestSTL.py b/lldb/test/API/lang/cpp/stl/TestSTL.py
index e796df698f979..27a4ee277b8f4 100644
--- a/lldb/test/API/lang/cpp/stl/TestSTL.py
+++ b/lldb/test/API/lang/cpp/stl/TestSTL.py
@@ -13,8 +13,6 @@
 
 class STLTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf
     @expectedFailureAll(bugnumber="llvm.org/PR36713")
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
index 9e5e651b05d26..70e925b9e6457 100644
--- a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -14,8 +14,6 @@
 
 class StdCXXDisassembleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     def test_stdcxx_disasm(self):
         """Do 'disassemble' on each and every 'Code' symbol entry from the std c++ lib."""

diff  --git a/lldb/test/API/lang/cpp/struct_with_keyword_name/TestStructWithKeywordName.py b/lldb/test/API/lang/cpp/struct_with_keyword_name/TestStructWithKeywordName.py
index af3b5a16cf5d2..079028065702c 100644
--- a/lldb/test/API/lang/cpp/struct_with_keyword_name/TestStructWithKeywordName.py
+++ b/lldb/test/API/lang/cpp/struct_with_keyword_name/TestStructWithKeywordName.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py b/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
index 603c2df7163e4..71290025a6380 100644
--- a/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
+++ b/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
@@ -5,8 +5,6 @@
 
 class TestStructuredBinding(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(oslist=["linux"], archs=["arm"])
     @skipIf(compiler="clang", compiler_version=['<', '14.0'])
     def test(self):

diff  --git a/lldb/test/API/lang/cpp/subst_template_type_param/TestSubstTemplateTypeParam.py b/lldb/test/API/lang/cpp/subst_template_type_param/TestSubstTemplateTypeParam.py
index 528ed94db0893..47ba550a4452c 100644
--- a/lldb/test/API/lang/cpp/subst_template_type_param/TestSubstTemplateTypeParam.py
+++ b/lldb/test/API/lang/cpp/subst_template_type_param/TestSubstTemplateTypeParam.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_typedef(self):
         target = self.dbg.GetDummyTarget()
 

diff  --git a/lldb/test/API/lang/cpp/template-arguments/TestCppTemplateArguments.py b/lldb/test/API/lang/cpp/template-arguments/TestCppTemplateArguments.py
index 3ba86bc44e259..8ec80895783bd 100644
--- a/lldb/test/API/lang/cpp/template-arguments/TestCppTemplateArguments.py
+++ b/lldb/test/API/lang/cpp/template-arguments/TestCppTemplateArguments.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py b/lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
index 0e74185546e84..49ddd1a86fbed 100644
--- a/lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
+++ b/lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
@@ -9,8 +9,6 @@
 
 class TemplateFunctionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def do_test_template_function(self, add_cast):
         self.build()
         lldbutil.run_to_source_breakpoint(self, '// break here',

diff  --git a/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py b/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
index 31f0081dc6977..3968f3a2534a6 100644
--- a/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
+++ b/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
@@ -9,8 +9,6 @@
 
 class TemplateSpecializationTypeTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_template_specialization_cast_children(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, '// break here',

diff  --git a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
index 67310ad59226a..a2d37fd41f019 100644
--- a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
+++ b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
@@ -13,8 +13,6 @@
 
 class TemplateArgsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def prepareProcess(self):
         self.build()
 

diff  --git a/lldb/test/API/lang/cpp/this/TestCPPThis.py b/lldb/test/API/lang/cpp/this/TestCPPThis.py
index 43b00f97d8fef..7a8c5c57972df 100644
--- a/lldb/test/API/lang/cpp/this/TestCPPThis.py
+++ b/lldb/test/API/lang/cpp/this/TestCPPThis.py
@@ -9,8 +9,6 @@
 
 class CPPThisTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # rdar://problem/9962849
     @expectedFailureAll(
         compiler="gcc",

diff  --git a/lldb/test/API/lang/cpp/this_class_type_mixing/TestThisClassTypeMixing.py b/lldb/test/API/lang/cpp/this_class_type_mixing/TestThisClassTypeMixing.py
index 8b09332af3f58..29c3c5d9fdd17 100644
--- a/lldb/test/API/lang/cpp/this_class_type_mixing/TestThisClassTypeMixing.py
+++ b/lldb/test/API/lang/cpp/this_class_type_mixing/TestThisClassTypeMixing.py
@@ -15,8 +15,6 @@ class by injecting a "$__lldb_expr" member function into the class. This
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py b/lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py
index 38b8cb5f0b61a..e0ecee10443c1 100644
--- a/lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py
+++ b/lldb/test/API/lang/cpp/thread_local/TestThreadLocal.py
@@ -9,8 +9,6 @@
 
 class PlatformProcessCrashInfoTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows", "linux", "freebsd", "netbsd"])
     def test_thread_local(self):
         # Set a breakpoint on the first instruction of the main function,

diff  --git a/lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py b/lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py
index 16e078ebe2801..cae6c954a2c37 100644
--- a/lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py
+++ b/lldb/test/API/lang/cpp/trivial_abi/TestTrivialABI.py
@@ -11,8 +11,6 @@
 
 
 class TestTrivialABI(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessSupportedTypeAttribute("trivial_abi")

diff  --git a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
index acbc8bee33673..fffdf7a8d3557 100644
--- a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
+++ b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
@@ -11,8 +11,6 @@
 
 class TestCppTypeLookup(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_value(self, value, ivar_name, ivar_value):
         self.assertSuccess(value.GetError(), "Invalid valobj")
         ivar = value.GetChildMemberWithName(ivar_name)

diff  --git a/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py b/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
index f3f54a816e69e..713015110ba95 100644
--- a/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
+++ b/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
@@ -10,8 +10,6 @@
 
 class TestCppTypedef(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_typedef(self):
         """
         Test that we retrieve typedefed types correctly

diff  --git a/lldb/test/API/lang/cpp/typeof/TestTypeOfDeclTypeExpr.py b/lldb/test/API/lang/cpp/typeof/TestTypeOfDeclTypeExpr.py
index 9c5289c4fa797..244bbf74cd922 100644
--- a/lldb/test/API/lang/cpp/typeof/TestTypeOfDeclTypeExpr.py
+++ b/lldb/test/API/lang/cpp/typeof/TestTypeOfDeclTypeExpr.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.expect_expr("int i; __typeof__(i) j = 1; j", result_type="typeof (i)", result_value="1")

diff  --git a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
index 931890e9056c4..0cca8816ae0b3 100644
--- a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
+++ b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
@@ -26,8 +26,6 @@
 
 class UnicodeLiteralsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_expr1(self):
         """Test that the expression parser returns proper Unicode strings."""
         self.rdar12991846(expr=1)

diff  --git a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
index 1d206504ecfb2..fe85c639acc3b 100644
--- a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
@@ -11,8 +11,6 @@
 
 class UniqueTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test for unique types of std::vector<long> and std::vector<short>."""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
index d6b6899012eca..3328ac0e59ae9 100644
--- a/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -12,8 +12,6 @@
 
 class UnsignedTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test that variables with unsigned types display correctly."""
         self.build()

diff  --git a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
index 4cbbc86fd1db0..a40cfda1853ac 100644
--- a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
+++ b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def common_setup(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "// break here", lldb.SBFileSpec("main.cpp"))

diff  --git a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
index 79f65527ec094..27a5a28811341 100644
--- a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -12,8 +12,6 @@
 
 class CxxWCharTTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test that C++ supports wchar_t correctly."""
         self.build()

diff  --git a/lldb/test/API/lang/mixed/TestMixedLanguages.py b/lldb/test/API/lang/mixed/TestMixedLanguages.py
index b4fe5396291e5..c7d26857eb530 100644
--- a/lldb/test/API/lang/mixed/TestMixedLanguages.py
+++ b/lldb/test/API/lang/mixed/TestMixedLanguages.py
@@ -9,8 +9,6 @@
 
 class MixedLanguagesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_language_of_frame(self):
         """Test that the language defaults to the language of the current frame."""
         self.build()

diff  --git a/lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py b/lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py
index 4e7590de608ea..82938420b2469 100644
--- a/lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py
+++ b/lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py
@@ -5,8 +5,6 @@
 
 class TestBitfieldIvars(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
 
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py
index fcefdf0e8341e..2c1ea723e5618 100644
--- a/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/test/API/lang/objc/blocks/TestObjCIvarsInBlocks.py
@@ -8,8 +8,6 @@
 
 class TestObjCIvarsInBlocks(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/complete-type-check/TestObjCIsTypeComplete.py b/lldb/test/API/lang/objc/complete-type-check/TestObjCIsTypeComplete.py
index 7820d4cb80616..9547c445376c9 100644
--- a/lldb/test/API/lang/objc/complete-type-check/TestObjCIsTypeComplete.py
+++ b/lldb/test/API/lang/objc/complete-type-check/TestObjCIsTypeComplete.py
@@ -7,8 +7,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/lang/objc/conflicting-class-list-function-from-user/TestObjCClassListFunctionFromUser.py b/lldb/test/API/lang/objc/conflicting-class-list-function-from-user/TestObjCClassListFunctionFromUser.py
index 87f6d2be0cc84..0bcc6eeb32c15 100644
--- a/lldb/test/API/lang/objc/conflicting-class-list-function-from-user/TestObjCClassListFunctionFromUser.py
+++ b/lldb/test/API/lang/objc/conflicting-class-list-function-from-user/TestObjCClassListFunctionFromUser.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     # LLDB ends up calling the user-defined function (but at least doesn't
     # crash).

diff  --git a/lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py b/lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
index b7cc7db17a7b5..5c37b287a07d9 100644
--- a/lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
+++ b/lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
@@ -10,8 +10,6 @@
 
 class TestRealDefinition(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_frame_var_after_stop_at_implementation(self):
         """Test that we can find the implementation for an objective C type"""
         if self.getArchitecture() == 'i386':

diff  --git a/lldb/test/API/lang/objc/cpp_keyword_identifiers/TestCppKeywordsAsObjCIdentifiers.py b/lldb/test/API/lang/objc/cpp_keyword_identifiers/TestCppKeywordsAsObjCIdentifiers.py
index feae4f0d86af1..0162383f6e31b 100644
--- a/lldb/test/API/lang/objc/cpp_keyword_identifiers/TestCppKeywordsAsObjCIdentifiers.py
+++ b/lldb/test/API/lang/objc/cpp_keyword_identifiers/TestCppKeywordsAsObjCIdentifiers.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py b/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
index 3787775012660..8f6ae646844bd 100644
--- a/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
+++ b/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
@@ -10,8 +10,6 @@
 
 
 class TestObjCDirectDispatchStepping(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
index d72334a1d38b1..54473e03bb36e 100644
--- a/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
+++ b/lldb/test/API/lang/objc/exceptions/TestObjCExceptions.py
@@ -13,8 +13,6 @@
 
 class ObjCExceptionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_objc_exceptions_at_throw(self):
         self.build()
 

diff  --git a/lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
index 0956ca0d4d467..0b6ffd82d5d31 100644
--- a/lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
@@ -10,8 +10,6 @@
 
 class ForwardDeclTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/foundation/TestConstStrings.py b/lldb/test/API/lang/objc/foundation/TestConstStrings.py
index 9a5bdf8f31c20..e9edf720c49f1 100644
--- a/lldb/test/API/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/test/API/lang/objc/foundation/TestConstStrings.py
@@ -12,8 +12,6 @@
 
 
 class ConstStringTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     d = {'OBJC_SOURCES': 'const-strings.m'}
 
     def setUp(self):

diff  --git a/lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py
index 8ff1611a19b09..4ee7ec58726cd 100644
--- a/lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/test/API/lang/objc/foundation/TestFoundationDisassembly.py
@@ -12,8 +12,6 @@
 
 class FoundationDisassembleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfAsan

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
index c60b01bcdac13..ac4477977b656 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
@@ -18,8 +18,6 @@
 
 class FoundationTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods2.py
index 1446c74f07ffc..b77c8e7349498 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethods2.py
@@ -12,8 +12,6 @@
 
 class FoundationTestCase2(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_expr_commands(self):

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py
index dd0d028fabad3..64fa1bc011ed8 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSArray.py
@@ -12,8 +12,6 @@
 
 class FoundationTestCaseNSArray(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_NSArray_expr_commands(self):
         """Test expression commands for NSArray."""
         self.build()

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py
index 4a04de3340f24..616557b46423b 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethodsNSError.py
@@ -12,8 +12,6 @@
 
 class FoundationTestCaseNSError(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(archs=["i[3-6]86"], bugnumber="<rdar://problem/28814052>")
     def test_runtime_types(self):
         """Test commands that require runtime types"""

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py b/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py
index 4a51a47f72b52..9760d6ab5b8c7 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethodsString.py
@@ -12,8 +12,6 @@
 
 class FoundationTestCaseString(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_NSString_expr_commands(self):
         """Test expression commands for NSString."""
         self.build()

diff  --git a/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
index f09b8ea514327..fd9713c313725 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
@@ -13,8 +13,6 @@
 
 class ObjectDescriptionAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py
index 9115d5a0685f3..c2e9c6b16adc8 100644
--- a/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/test/API/lang/objc/foundation/TestRuntimeTypes.py
@@ -12,8 +12,6 @@
 
 class RuntimeTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["macosx"],
         debug_info="gmodules",

diff  --git a/lldb/test/API/lang/objc/foundation/TestSymbolTable.py b/lldb/test/API/lang/objc/foundation/TestSymbolTable.py
index 7434258baa465..0afcb17811c3c 100644
--- a/lldb/test/API/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/test/API/lang/objc/foundation/TestSymbolTable.py
@@ -10,8 +10,6 @@
 
 class FoundationSymtabTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     symbols_list = ['-[MyString initWithNSString:]',
                     '-[MyString dealloc]',
                     '-[MyString description]',

diff  --git a/lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py b/lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py
index 1f88884ce6f8c..8ff90efe5dbd5 100644
--- a/lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py
+++ b/lldb/test/API/lang/objc/global_ptrs/TestGlobalObjects.py
@@ -10,8 +10,6 @@
 
 class TestObjCGlobalVar(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
index f904369579601..20dcb054b6c95 100644
--- a/lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -13,8 +13,6 @@
 
 class HiddenIvarsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index c85c74a0369f3..ac5fa48b0ec96 100644
--- a/lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/test/API/lang/objc/ivar-IMP/TestObjCiVarIMP.py
@@ -13,8 +13,6 @@
 
 class ObjCiVarIMPTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(archs=['i386'])  # objc file does not build for i386
     @no_debug_info_test
     def test_imp_ivar_type(self):

diff  --git a/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py b/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
index 45870e8a0dce8..4a801e23b7b0f 100644
--- a/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
+++ b/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
@@ -10,7 +10,6 @@
 
 
 class TestClangModuleAppUpdate(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(debug_info=no_match(["gmodules"]))
     def test_rebuild_app_modules_untouched(self):

diff  --git a/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
index ceef95d593f96..97071dcfbe0f9 100644
--- a/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -12,8 +12,6 @@
 
 class ObjCModulesAutoImportTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py b/lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py
index 0e241227f8ec6..72ce864a8ac5c 100644
--- a/lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py
+++ b/lldb/test/API/lang/objc/modules-cache/TestClangModulesCache.py
@@ -14,7 +14,6 @@
 
 class ObjCModulesTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_expr(self):
         self.build()

diff  --git a/lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py b/lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py
index 36cf050011c8e..9a5cb257601da 100644
--- a/lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py
+++ b/lldb/test/API/lang/objc/modules-compile-error/TestModulesCompileError.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(compiler="clang", compiler_version=['<', '11.0'])
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py b/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
index bb5dd366b377a..1c9e8be53bbd8 100644
--- a/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
+++ b/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
@@ -10,7 +10,6 @@
 
 
 class TestClangModuleHashMismatch(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(debug_info=no_match(["gmodules"]))
     def test_expr(self):

diff  --git a/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
index fc598ea12c70b..1e1771900c735 100644
--- a/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -11,8 +11,6 @@
 
 class IncompleteModulesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index a71e72f828d43..77036c468091c 100644
--- a/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -13,8 +13,6 @@
 
 class ModulesInlineFunctionsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(macos_version=["<", "10.12"], debug_info=no_match(["gmodules"]))
     def test_expr(self):
         self.build()

diff  --git a/lldb/test/API/lang/objc/modules-non-objc-target/TestObjCModulesNonObjCTarget.py b/lldb/test/API/lang/objc/modules-non-objc-target/TestObjCModulesNonObjCTarget.py
index 036d9dcd7ed7c..259883bf0db1f 100644
--- a/lldb/test/API/lang/objc/modules-non-objc-target/TestObjCModulesNonObjCTarget.py
+++ b/lldb/test/API/lang/objc/modules-non-objc-target/TestObjCModulesNonObjCTarget.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self,"// break here", lldb.SBFileSpec("main.c"))

diff  --git a/lldb/test/API/lang/objc/modules-objc-property/TestModulesObjCProperty.py b/lldb/test/API/lang/objc/modules-objc-property/TestModulesObjCProperty.py
index d23949fe30b47..3ae90a8c46917 100644
--- a/lldb/test/API/lang/objc/modules-objc-property/TestModulesObjCProperty.py
+++ b/lldb/test/API/lang/objc/modules-objc-property/TestModulesObjCProperty.py
@@ -8,8 +8,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_conflicting_properties(self):
         """ Tests receiving two properties with the same name from modules."""

diff  --git a/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py b/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
index 82adfd954e89b..dfa2e0a43d6bc 100644
--- a/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
+++ b/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
@@ -10,7 +10,6 @@
 
 
 class TestClangModuleUpdate(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIf(debug_info=no_match(["gmodules"]))
     @skipIfDarwin # rdar://76540904

diff  --git a/lldb/test/API/lang/objc/modules/TestObjCModules.py b/lldb/test/API/lang/objc/modules/TestObjCModules.py
index 66c1b33da4e2e..a0ccf42000c6c 100644
--- a/lldb/test/API/lang/objc/modules/TestObjCModules.py
+++ b/lldb/test/API/lang/objc/modules/TestObjCModules.py
@@ -12,8 +12,6 @@
 
 class ObjCModulesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc++/TestObjCXX.py b/lldb/test/API/lang/objc/objc++/TestObjCXX.py
index d04fba7cc2259..8fa469d588bae 100644
--- a/lldb/test/API/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/test/API/lang/objc/objc++/TestObjCXX.py
@@ -12,8 +12,6 @@
 
 class ObjCXXTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_break(self):
         """Test ivars of Objective-C++ classes"""
         if self.getArchitecture() == 'i386':

diff  --git a/lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index 17bc5313b9524..2cbfd2986df4a 100644
--- a/lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/test/API/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
@@ -12,8 +12,6 @@
 
 class ObjCDynamicValueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py
index f974b298c4f1d..4c69e392d595f 100644
--- a/lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/test/API/lang/objc/objc-checker/TestObjCCheckers.py
@@ -12,8 +12,6 @@
 
 class ObjCCheckerTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
index 27d4507e6f07e..c1fd60371cf38 100644
--- a/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
@@ -11,8 +11,6 @@
 
 class TestObjCClassMethod(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index d67d83873f29a..363b2316155bc 100644
--- a/lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/test/API/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
@@ -12,8 +12,6 @@
 
 class ObjCDynamicSBTypeTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index d70ff320a9e2c..71d5a348e432c 100644
--- a/lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/API/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -12,8 +12,6 @@
 
 class ObjCDynamicValueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 9f9e5d12aa701..25ccf29faf92f 100644
--- a/lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/test/API/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -10,8 +10,6 @@
 
 class TestObjCIvarOffsets(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index bc14acc2b6fe0..d5ee49e256b0c 100644
--- a/lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/test/API/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
@@ -10,8 +10,6 @@
 
 class TestObjCIvarStripped(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py b/lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
index fc66af2b38373..7dd407db6d593 100644
--- a/lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
+++ b/lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
@@ -8,8 +8,6 @@
 
 class ObjCNewSyntaxTest(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def target(self):
         return self._target
 

diff  --git a/lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py
index 3410cc6bedd1b..d565dea425f7d 100644
--- a/lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/test/API/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -20,8 +20,6 @@
 
 
 class ObjcOptimizedTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     myclass = "MyClass"
     mymethod = "description"
     method_spec = "-[%s %s]" % (myclass, mymethod)

diff  --git a/lldb/test/API/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/API/lang/objc/objc-property/TestObjCProperty.py
index 73bf673ab7490..1582d3f518642 100644
--- a/lldb/test/API/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/test/API/lang/objc/objc-property/TestObjCProperty.py
@@ -12,8 +12,6 @@
 
 class ObjCPropertyTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index cb3cce6c3e0f5..646600b9fa9ce 100644
--- a/lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/test/API/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
@@ -10,8 +10,6 @@
 
 class TestObjCStaticMethodStripped(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py
index 786547e7be9a3..09830ed2a60e5 100644
--- a/lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/test/API/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -10,8 +10,6 @@
 
 class TestObjCStaticMethod(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
index b77a13ff38218..7943f5421182c 100644
--- a/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
@@ -11,8 +11,6 @@
 
 class TestObjCStepping(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 3530ebceef58f..1be684cbfbdcc 100644
--- a/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -10,8 +10,6 @@
 
 class TestObjCStructArgument(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py
index 8fe0aea9d2f7c..8c83552ad3a9d 100644
--- a/lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/test/API/lang/objc/objc-struct-return/TestObjCStructReturn.py
@@ -10,8 +10,6 @@
 
 class TestObjCClassMethod(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/API/lang/objc/objc-super/TestObjCSuper.py
index 47f7dd9076626..3df5393e7e625 100644
--- a/lldb/test/API/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/test/API/lang/objc/objc-super/TestObjCSuper.py
@@ -10,8 +10,6 @@
 
 class TestObjCSuperMethod(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py b/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
index ac7af265b27c1..d992c54281225 100644
--- a/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
+++ b/lldb/test/API/lang/objc/orderedset/TestOrderedSet.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestOrderedSet(TestBase):
-  mydir = TestBase.compute_mydir(__file__)
 
   def test_ordered_set(self):
     self.build()

diff  --git a/lldb/test/API/lang/objc/print-obj/TestPrintObj.py b/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
index 6e32a6711016f..18d60d24e222d 100644
--- a/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
@@ -13,8 +13,6 @@
 
 class PrintObjTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py b/lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py
index b97a7f59ad65c..badc81ac0a724 100644
--- a/lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py
+++ b/lldb/test/API/lang/objc/ptr_refs/TestPtrRefsObjC.py
@@ -11,8 +11,6 @@
 
 class TestPtrRefsObjC(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfAsan # The output looks 
diff erent under ASAN.
     def test_ptr_refs(self):
         """Test the ptr_refs tool on Darwin with Objective-C"""

diff  --git a/lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index 18084fd85ea06..3cb783c6ad488 100644
--- a/lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/test/API/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
@@ -12,8 +12,6 @@
 
 class MethodReturningBOOLTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py
index e7a9979eaa52c..05541b227d93b 100644
--- a/lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/test/API/lang/objc/rdar-10967107/TestRdar10967107.py
@@ -12,8 +12,6 @@
 
 class Rdar10967107TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py
index 2ec1b5f8b473b..f0f3ec447469e 100644
--- a/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/test/API/lang/objc/rdar-11355592/TestRdar11355592.py
@@ -12,8 +12,6 @@
 
 class Rdar10967107TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py
index fe9d58ece52f3..376db0fe67900 100644
--- a/lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/test/API/lang/objc/rdar-12408181/TestRdar12408181.py
@@ -17,8 +17,6 @@
 # and gives a spurious failure.
 class Rdar12408181TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
index ff3e46fc27e10..c182bc12ef20e 100644
--- a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
@@ -10,8 +10,6 @@
 
 class TestRealDefinition(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_frame_var_after_stop_at_interface(self):
         """Test that we can find the implementation for an objective C type"""
         if self.getArchitecture() == 'i386':

diff  --git a/lldb/test/API/lang/objc/self/TestObjCSelf.py b/lldb/test/API/lang/objc/self/TestObjCSelf.py
index 5773cdccee5d7..05f525ca3c67e 100644
--- a/lldb/test/API/lang/objc/self/TestObjCSelf.py
+++ b/lldb/test/API/lang/objc/self/TestObjCSelf.py
@@ -9,8 +9,6 @@
 
 class ObjCSelfTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_run_command(self):
         """Test that the appropriate member variables are available when stopped in Objective-C class and instance methods"""
         self.build()

diff  --git a/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py b/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
index d0394662e281a..770eae9ed0d45 100644
--- a/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
+++ b/lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
@@ -13,8 +13,6 @@
 
 class ObjCSingleEntryDictionaryTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/lang/objc/tagged-pointer/TestTaggedPointerCmd.py b/lldb/test/API/lang/objc/tagged-pointer/TestTaggedPointerCmd.py
index e5ad111217de9..b0cd4e9cc1b6b 100644
--- a/lldb/test/API/lang/objc/tagged-pointer/TestTaggedPointerCmd.py
+++ b/lldb/test/API/lang/objc/tagged-pointer/TestTaggedPointerCmd.py
@@ -6,8 +6,6 @@
 
 class TestTaggedPointerCommand(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test(self):
         self.build()

diff  --git a/lldb/test/API/lang/objc/warnings-in-expr-parser/TestObjCWarningsInExprParser.py b/lldb/test/API/lang/objc/warnings-in-expr-parser/TestObjCWarningsInExprParser.py
index b0b52cbdab760..7f9f29d22ea0b 100644
--- a/lldb/test/API/lang/objc/warnings-in-expr-parser/TestObjCWarningsInExprParser.py
+++ b/lldb/test/API/lang/objc/warnings-in-expr-parser/TestObjCWarningsInExprParser.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @no_debug_info_test
     def test(self):

diff  --git a/lldb/test/API/lang/objcxx/conflicting-names-class-update-utility-expr/TestObjCConflictingNamesForClassUpdateExpr.py b/lldb/test/API/lang/objcxx/conflicting-names-class-update-utility-expr/TestObjCConflictingNamesForClassUpdateExpr.py
index cac65089a28f1..86d8f4ee22e74 100644
--- a/lldb/test/API/lang/objcxx/conflicting-names-class-update-utility-expr/TestObjCConflictingNamesForClassUpdateExpr.py
+++ b/lldb/test/API/lang/objcxx/conflicting-names-class-update-utility-expr/TestObjCConflictingNamesForClassUpdateExpr.py
@@ -5,8 +5,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """
         Tests that running the utility expression that retrieves the Objective-C

diff  --git a/lldb/test/API/lang/objcxx/cpp_keywords_enabled/TestObjCppKeywordsEnabled.py b/lldb/test/API/lang/objcxx/cpp_keywords_enabled/TestObjCppKeywordsEnabled.py
index f8743536de1e3..b5ffc503cfeaa 100644
--- a/lldb/test/API/lang/objcxx/cpp_keywords_enabled/TestObjCppKeywordsEnabled.py
+++ b/lldb/test/API/lang/objcxx/cpp_keywords_enabled/TestObjCppKeywordsEnabled.py
@@ -6,8 +6,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @no_debug_info_test
     def test_keyword(self):

diff  --git a/lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py b/lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py
index fe0be0553e4d3..5b96aed38e3aa 100644
--- a/lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py
+++ b/lldb/test/API/lang/objcxx/cxx-bridged-po/TestObjCXXBridgedPO.py
@@ -5,8 +5,6 @@
 
 class TestObjCXXBridgedPO(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_bridged_type_po(self):
         self.build()
         lldbutil.run_to_source_breakpoint(

diff  --git a/lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py b/lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py
index 7e16aeb5aaba6..1e0b1b0d9ddfc 100644
--- a/lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py
+++ b/lldb/test/API/lang/objcxx/hide-runtime-values/TestObjCXXHideRuntimeValues.py
@@ -7,8 +7,6 @@
 
 class TestObjCXXHideRuntimeSupportValues(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_hide_runtime_support_values(self):
         self.build()
         _, process, _, _ = lldbutil.run_to_source_breakpoint(

diff  --git a/lldb/test/API/lang/objcxx/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/API/lang/objcxx/objc-builtin-types/TestObjCBuiltinTypes.py
index 7e7ac75ae948b..f6123066a90dd 100644
--- a/lldb/test/API/lang/objcxx/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/test/API/lang/objcxx/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -8,8 +8,6 @@
 
 class TestObjCBuiltinTypes(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/linux/aarch64/mte_memory_region/TestAArch64LinuxMTEMemoryRegion.py b/lldb/test/API/linux/aarch64/mte_memory_region/TestAArch64LinuxMTEMemoryRegion.py
index e271a8bf69200..af267fc130d20 100644
--- a/lldb/test/API/linux/aarch64/mte_memory_region/TestAArch64LinuxMTEMemoryRegion.py
+++ b/lldb/test/API/linux/aarch64/mte_memory_region/TestAArch64LinuxMTEMemoryRegion.py
@@ -13,8 +13,6 @@
 
 class AArch64LinuxMTEMemoryRegionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessArch("aarch64")

diff  --git a/lldb/test/API/linux/aarch64/mte_tag_access/TestAArch64LinuxMTEMemoryTagAccess.py b/lldb/test/API/linux/aarch64/mte_tag_access/TestAArch64LinuxMTEMemoryTagAccess.py
index ec5d110461aa0..9cdbf36984fc4 100644
--- a/lldb/test/API/linux/aarch64/mte_tag_access/TestAArch64LinuxMTEMemoryTagAccess.py
+++ b/lldb/test/API/linux/aarch64/mte_tag_access/TestAArch64LinuxMTEMemoryTagAccess.py
@@ -12,8 +12,6 @@
 
 class AArch64LinuxMTEMemoryTagAccessTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setup_mte_test(self):

diff  --git a/lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py b/lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py
index 62234e674a9aa..6c1c45d7dad43 100644
--- a/lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py
+++ b/lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py
@@ -11,8 +11,6 @@
 
 class AArch64LinuxMTEMemoryTagFaultsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setup_mte_test(self, fault_type):

diff  --git a/lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py b/lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py
index d3de12d1b88a0..87953cbad475f 100644
--- a/lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py
+++ b/lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py
@@ -16,8 +16,6 @@
 
 class AArch64LinuxNonAddressBitMemoryAccessTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setup_test(self):

diff  --git a/lldb/test/API/linux/aarch64/tagged_memory_access/TestAArch64LinuxTaggedMemoryAccess.py b/lldb/test/API/linux/aarch64/tagged_memory_access/TestAArch64LinuxTaggedMemoryAccess.py
index 3cc0d70a3ce34..7ae7df70cb862 100644
--- a/lldb/test/API/linux/aarch64/tagged_memory_access/TestAArch64LinuxTaggedMemoryAccess.py
+++ b/lldb/test/API/linux/aarch64/tagged_memory_access/TestAArch64LinuxTaggedMemoryAccess.py
@@ -16,8 +16,6 @@
 
 class AArch64LinuxTaggedMemoryReadTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setup_test(self):

diff  --git a/lldb/test/API/linux/aarch64/tagged_memory_region/TestAArch64LinuxTaggedMemoryRegion.py b/lldb/test/API/linux/aarch64/tagged_memory_region/TestAArch64LinuxTaggedMemoryRegion.py
index cbd772ecebbc6..104ab9c199d12 100644
--- a/lldb/test/API/linux/aarch64/tagged_memory_region/TestAArch64LinuxTaggedMemoryRegion.py
+++ b/lldb/test/API/linux/aarch64/tagged_memory_region/TestAArch64LinuxTaggedMemoryRegion.py
@@ -13,8 +13,6 @@
 
 class AArch64LinuxTaggedMemoryRegionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     # AArch64 Linux always enables the top byte ignore feature

diff  --git a/lldb/test/API/linux/aarch64/unwind_signal/TestUnwindSignal.py b/lldb/test/API/linux/aarch64/unwind_signal/TestUnwindSignal.py
index 9d09694f290ac..a635fb4cc3a6d 100644
--- a/lldb/test/API/linux/aarch64/unwind_signal/TestUnwindSignal.py
+++ b/lldb/test/API/linux/aarch64/unwind_signal/TestUnwindSignal.py
@@ -10,8 +10,6 @@
 
 class UnwindSignalTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessArch("aarch64")

diff  --git a/lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py b/lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py
index d88980722a645..a4ae01000c219 100644
--- a/lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py
+++ b/lldb/test/API/linux/add-symbols/TestTargetSymbolsAddCommand.py
@@ -7,8 +7,6 @@
 
 class TargetSymbolsAddCommand(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = 'main.c'

diff  --git a/lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py
index bc67de6fa28e6..ab204344ab84b 100644
--- a/lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/test/API/linux/builtin_trap/TestBuiltinTrap.py
@@ -13,8 +13,6 @@
 
 class BuiltinTrapTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py b/lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
index a22a8bef9e15f..175bd066955a2 100644
--- a/lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
+++ b/lldb/test/API/linux/mix-dwo-and-regular-objects/TestMixedDwarfBinary.py
@@ -6,7 +6,6 @@
 
 
 class TestMixedDwarfBinary(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @no_debug_info_test  # Prevent the genaration of the dwarf version of this test
     @add_test_categories(["dwo"])

diff  --git a/lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py b/lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py
index 7338332dcfc4d..3c1971d7e1b13 100644
--- a/lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py
+++ b/lldb/test/API/linux/sepdebugsymlink/TestTargetSymbolsSepDebugSymlink.py
@@ -7,8 +7,6 @@
 
 class TestTargetSymbolsSepDebugSymlink(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test  # Prevent the genaration of the dwarf version of this test
     @skipUnlessPlatform(['linux'])
     @skipIf(hostoslist=["windows"])

diff  --git a/lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 5b3387751cc8b..e6d4db9950502 100644
--- a/lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/test/API/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -11,8 +11,6 @@
 
 
 class CreateDuringInstructionStepTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessPlatform(['linux'])

diff  --git a/lldb/test/API/lua_api/TestLuaAPI.py b/lldb/test/API/lua_api/TestLuaAPI.py
index bf25ded5160f0..32ec833bde8ea 100644
--- a/lldb/test/API/lua_api/TestLuaAPI.py
+++ b/lldb/test/API/lua_api/TestLuaAPI.py
@@ -130,8 +130,6 @@ def killProcess():
     return out, err, exitCode
 
 class TestLuaAPI(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def get_tests(self):

diff  --git a/lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py b/lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py
index 5075868e9c1a7..91cfd469e442b 100644
--- a/lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py
+++ b/lldb/test/API/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py
@@ -8,8 +8,6 @@
 
 class TestDSYMSourcePathRemapping(lldbtest.TestBase):
 
-    mydir = lldbtest.TestBase.compute_mydir(__file__)
-
     def build(self):
         botdir = self.getBuildArtifact('buildbot')
         userdir = self.getBuildArtifact('user')

diff  --git a/lldb/test/API/macosx/add-dsym/TestAddDsymDownload.py b/lldb/test/API/macosx/add-dsym/TestAddDsymDownload.py
index 68efcc89cfd71..2bb6f11fba300 100644
--- a/lldb/test/API/macosx/add-dsym/TestAddDsymDownload.py
+++ b/lldb/test/API/macosx/add-dsym/TestAddDsymDownload.py
@@ -6,8 +6,6 @@
 
 @skipUnlessDarwin
 class AddDsymDownload(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     dwarfdump_uuid_regex = re.compile('UUID: ([-0-9a-fA-F]+) \(([^\(]+)\) .*')
 
     def get_uuid(self):

diff  --git a/lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
index 639f57d954e33..25bf894524b1b 100644
--- a/lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
+++ b/lldb/test/API/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
@@ -11,8 +11,6 @@
 @skipUnlessDarwin
 class AddDsymMidExecutionCommandCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py b/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py
index d645da460df4d..0ebb07188018a 100644
--- a/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py
+++ b/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py
@@ -9,8 +9,6 @@
 
 class BuiltinDebugTrapTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     # Currently this depends on behavior in debugserver to

diff  --git a/lldb/test/API/macosx/corefile-default-ptrauth/TestCorefileDefaultPtrauth.py b/lldb/test/API/macosx/corefile-default-ptrauth/TestCorefileDefaultPtrauth.py
index d3b086191ca52..f9a62bc2b6778 100644
--- a/lldb/test/API/macosx/corefile-default-ptrauth/TestCorefileDefaultPtrauth.py
+++ b/lldb/test/API/macosx/corefile-default-ptrauth/TestCorefileDefaultPtrauth.py
@@ -13,8 +13,6 @@
 
 class TestCorefileDefaultPtrauth(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking explicitly for a dSYM")
     @skipIf(archs=no_match(['arm64','arm64e']))
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py b/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
index 33f4839fddc4e..cd87816549af1 100644
--- a/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
+++ b/lldb/test/API/macosx/corefile-exception-reason/TestCorefileExceptionReason.py
@@ -11,8 +11,6 @@
 
 class TestCorefileExceptionReason(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfOutOfTreeDebugserver  # newer debugserver required for these qMemoryRegionInfo types
     @no_debug_info_test
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
index d80c2dd4eba91..c76cf192a3bb4 100644
--- a/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
+++ b/lldb/test/API/macosx/debugserver-exit-code/TestDebugServerExitCode.py
@@ -9,8 +9,6 @@
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipUnlessDarwin
     @skipIfOutOfTreeDebugserver

diff  --git a/lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py b/lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py
index 3fecb3beae5a3..039bd2f0a56c2 100644
--- a/lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py
+++ b/lldb/test/API/macosx/duplicate-archive-members/TestDuplicateMembers.py
@@ -10,8 +10,6 @@
 
 class BSDArchivesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["windows"],
         bugnumber="llvm.org/pr24527.  Makefile.rules doesn't know how to build static libs on Windows")

diff  --git a/lldb/test/API/macosx/dyld-trie-symbols/TestDyldTrieSymbols.py b/lldb/test/API/macosx/dyld-trie-symbols/TestDyldTrieSymbols.py
index 71598e9f15464..641e1344a2530 100644
--- a/lldb/test/API/macosx/dyld-trie-symbols/TestDyldTrieSymbols.py
+++ b/lldb/test/API/macosx/dyld-trie-symbols/TestDyldTrieSymbols.py
@@ -9,8 +9,6 @@
 
 class DyldTrieSymbolsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py b/lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py
index 331bc6dae889d..dabab9719c7a8 100644
--- a/lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py
+++ b/lldb/test/API/macosx/find-app-in-bundle/TestFindAppInBundle.py
@@ -11,8 +11,6 @@
 @decorators.skipUnlessDarwin
 class FindAppInMacOSAppBundle(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_find_app_in_bundle(self):

diff  --git a/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
index 76f7ee85f5013..771887ff83d8f 100644
--- a/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
+++ b/lldb/test/API/macosx/find-dsym/bundle-with-dot-in-filename/TestBundleWithDotInFilename.py
@@ -15,8 +15,6 @@
 
 class BundleWithDotInFilenameTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = 'main.c'

diff  --git a/lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py b/lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py
index bb32a90e09814..0786121f6427d 100644
--- a/lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py
+++ b/lldb/test/API/macosx/find-dsym/deep-bundle/TestDeepBundle.py
@@ -14,8 +14,6 @@
 
 class DeepBundleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = 'main.c'

diff  --git a/lldb/test/API/macosx/function-starts/TestFunctionStarts.py b/lldb/test/API/macosx/function-starts/TestFunctionStarts.py
index 21b494f185dc5..9b8ef06ac7eb0 100644
--- a/lldb/test/API/macosx/function-starts/TestFunctionStarts.py
+++ b/lldb/test/API/macosx/function-starts/TestFunctionStarts.py
@@ -13,8 +13,6 @@
 
 class FunctionStartsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote

diff  --git a/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py b/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
index 990a225512b40..16fa762245825 100644
--- a/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
+++ b/lldb/test/API/macosx/ignore_exceptions/TestIgnoredExceptions.py
@@ -10,8 +10,6 @@
 
 class TestDarwinSignalHandlers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py
index e2cebf0209104..8006819083fa1 100644
--- a/lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py
@@ -10,8 +10,6 @@
 
 class TestIndirectFunctions(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/macosx/lc-note/addrable-bits/TestAddrableBitsCorefile.py b/lldb/test/API/macosx/lc-note/addrable-bits/TestAddrableBitsCorefile.py
index 09e5662c8373f..7c6a5b1718de5 100644
--- a/lldb/test/API/macosx/lc-note/addrable-bits/TestAddrableBitsCorefile.py
+++ b/lldb/test/API/macosx/lc-note/addrable-bits/TestAddrableBitsCorefile.py
@@ -13,8 +13,6 @@
 
 
 class TestAddrableBitsCorefile(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def initial_setup(self):

diff  --git a/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py b/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py
index 6600c6344c7dc..6d352caab0449 100644
--- a/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py
+++ b/lldb/test/API/macosx/lc-note/firmware-corefile/TestFirmwareCorefiles.py
@@ -14,8 +14,6 @@
 
 class TestFirmwareCorefiles(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking explicitly for a dSYM")
     @skipIf(archs=no_match(['x86_64', 'arm64', 'arm64e', 'aarch64']))
     @skipIfRemote

diff  --git a/lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py b/lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py
index 98f3e67ed0f6c..d85d6843e2cd2 100644
--- a/lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py
+++ b/lldb/test/API/macosx/lc-note/kern-ver-str/TestKernVerStrLCNOTE.py
@@ -14,8 +14,6 @@
 
 class TestKernVerStrLCNOTE(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking explicitly for a dSYM")
     @skipIf(archs=no_match(['x86_64']))
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/load-kext/TestLoadKext.py b/lldb/test/API/macosx/load-kext/TestLoadKext.py
index d2e9a7ce658b2..1223c04c01a18 100644
--- a/lldb/test/API/macosx/load-kext/TestLoadKext.py
+++ b/lldb/test/API/macosx/load-kext/TestLoadKext.py
@@ -13,8 +13,6 @@
 class LoadKextTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_load_kext(self):
         """Test that lldb can load a kext binary."""
 

diff  --git a/lldb/test/API/macosx/macCatalyst/TestMacCatalyst.py b/lldb/test/API/macosx/macCatalyst/TestMacCatalyst.py
index 4114f4c941687..6b69cb42a4cd0 100644
--- a/lldb/test/API/macosx/macCatalyst/TestMacCatalyst.py
+++ b/lldb/test/API/macosx/macCatalyst/TestMacCatalyst.py
@@ -8,8 +8,6 @@
 
 class TestMacCatalyst(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(macos_version=["<", "10.15"])
     @skipUnlessDarwin
     @skipIfDarwinEmbedded

diff  --git a/lldb/test/API/macosx/macCatalystAppMacOSFramework/TestMacCatalystAppWithMacOSFramework.py b/lldb/test/API/macosx/macCatalystAppMacOSFramework/TestMacCatalystAppWithMacOSFramework.py
index 989bf6d6e3301..b543ce94d9cf0 100644
--- a/lldb/test/API/macosx/macCatalystAppMacOSFramework/TestMacCatalystAppWithMacOSFramework.py
+++ b/lldb/test/API/macosx/macCatalystAppMacOSFramework/TestMacCatalystAppWithMacOSFramework.py
@@ -8,8 +8,6 @@
 
 class TestMacCatalystAppWithMacOSFramework(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(macos_version=["<", "10.15"])
     @skipUnlessDarwin
     @skipIfDarwinEmbedded

diff  --git a/lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py b/lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py
index 2878ef1c6a9d7..9d380b738c8d1 100644
--- a/lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py
+++ b/lldb/test/API/macosx/nslog/TestDarwinNSLogOutput.py
@@ -19,7 +19,6 @@
 
 class DarwinNSLogOutputTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
     @skipIfRemote   # this test is currently written using lldb commands & assumes running on local system

diff  --git a/lldb/test/API/macosx/order/TestOrderFile.py b/lldb/test/API/macosx/order/TestOrderFile.py
index 778d06ddaca90..9a12906b0c2f7 100644
--- a/lldb/test/API/macosx/order/TestOrderFile.py
+++ b/lldb/test/API/macosx/order/TestOrderFile.py
@@ -13,8 +13,6 @@
 
 class OrderFileTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test(self):
         """Test debug symbols follow the correct order by the order file."""

diff  --git a/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py b/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py
index 8c3017630b99e..e028ebf2a06d4 100644
--- a/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py
+++ b/lldb/test/API/macosx/posix_spawn/TestLaunchProcessPosixSpawn.py
@@ -19,7 +19,6 @@ def apple_silicon():
 
 class TestLaunchProcessPosixSpawn(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def no_haswell(self):
         if not haswell():

diff  --git a/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py b/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
index 86a4d808a167f..7e288701ec0b9 100644
--- a/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
+++ b/lldb/test/API/macosx/profile_vrs_detach/TestDetachVrsProfile.py
@@ -17,8 +17,6 @@
 
 class TestDetachVrsProfile(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/queues/TestQueues.py b/lldb/test/API/macosx/queues/TestQueues.py
index 6eeb86da4e71d..bf294e696a782 100644
--- a/lldb/test/API/macosx/queues/TestQueues.py
+++ b/lldb/test/API/macosx/queues/TestQueues.py
@@ -13,8 +13,6 @@
 
 class TestQueues(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @add_test_categories(['pyapi'])
     def test_with_python_api_queues(self):

diff  --git a/lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py
index f77f343f18f4a..ba0ad6bf7c2fc 100644
--- a/lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/test/API/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -10,8 +10,6 @@
 
 class TestSafeFuncCalls(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @add_test_categories(['pyapi'])
     def test_with_python_api(self):

diff  --git a/lldb/test/API/macosx/save_crashlog/TestSaveCrashlog.py b/lldb/test/API/macosx/save_crashlog/TestSaveCrashlog.py
index e2679200d71dc..5dfde317d2639 100644
--- a/lldb/test/API/macosx/save_crashlog/TestSaveCrashlog.py
+++ b/lldb/test/API/macosx/save_crashlog/TestSaveCrashlog.py
@@ -12,8 +12,6 @@
 
 class TestSaveCrashlog(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
index 4b925ad5f77d5..3974203621e23 100644
--- a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
+++ b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
@@ -7,8 +7,6 @@
 
 
 class TestSimulatorPlatformLaunching(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def check_load_commands(self, expected_load_command):

diff  --git a/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py b/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
index 1df04988d3a38..7e3f8dde8a983 100644
--- a/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
+++ b/lldb/test/API/macosx/skinny-corefile/TestSkinnyCorefile.py
@@ -14,8 +14,6 @@
 
 class TestSkinnyCorefile(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfOutOfTreeDebugserver  # newer debugserver required for these qMemoryRegionInfo types
     @skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is looking explicitly for a dSYM")
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py b/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
index 04a87c3cb9e0b..e4129aeec05b2 100644
--- a/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
+++ b/lldb/test/API/macosx/stack-corefile/TestStackCorefile.py
@@ -11,8 +11,6 @@
 
 class TestStackCorefile(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfOutOfTreeDebugserver  # newer debugserver required for these qMemoryRegionInfo types
     @no_debug_info_test
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py b/lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py
index 98e6aff5b4023..bd943f35d45cf 100644
--- a/lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py
+++ b/lldb/test/API/macosx/thread-names/TestInterruptThreadNames.py
@@ -10,8 +10,6 @@
 
 class TestInterruptThreadNames(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @add_test_categories(['pyapi'])
     def test_with_python_api(self):

diff  --git a/lldb/test/API/macosx/thread_suspend/TestInternalThreadSuspension.py b/lldb/test/API/macosx/thread_suspend/TestInternalThreadSuspension.py
index 66128585ceb3a..da89a02a7cd4b 100644
--- a/lldb/test/API/macosx/thread_suspend/TestInternalThreadSuspension.py
+++ b/lldb/test/API/macosx/thread_suspend/TestInternalThreadSuspension.py
@@ -10,8 +10,6 @@
 
 class TestSuspendedThreadHandling(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff  --git a/lldb/test/API/macosx/universal/TestUniversal.py b/lldb/test/API/macosx/universal/TestUniversal.py
index cb7a5c44da908..145d436be81e4 100644
--- a/lldb/test/API/macosx/universal/TestUniversal.py
+++ b/lldb/test/API/macosx/universal/TestUniversal.py
@@ -13,7 +13,6 @@ class UniversalTestCase(TestBase):
     """Test aspects of lldb commands on universal binaries."""
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         # Call super's setUp().

diff  --git a/lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py b/lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py
index 7778ab0e012a6..2dfb6dae48173 100644
--- a/lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py
+++ b/lldb/test/API/macosx/version_zero/TestGetVersionZeroVersion.py
@@ -12,8 +12,6 @@
 
 class TestGetVersionForZero(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py b/lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py
index bd02b7663f07a..014065e51919b 100644
--- a/lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py
+++ b/lldb/test/API/python_api/breakpoint/TestBreakpointAPI.py
@@ -9,8 +9,6 @@
 
 
 class BreakpointAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_breakpoint_is_valid(self):

diff  --git a/lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py b/lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py
index 1dcafbced1a5e..5eb644294bb64 100644
--- a/lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py
+++ b/lldb/test/API/python_api/class_members/TestSBTypeClassMembers.py
@@ -12,8 +12,6 @@
 
 class SBTypeMemberFunctionsTest(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py b/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
index 9f7de01d85da4..c4eceeae7ff81 100644
--- a/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
+++ b/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
@@ -10,8 +10,6 @@
 
 class CompileUnitAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 

diff  --git a/lldb/test/API/python_api/debugger/TestDebuggerAPI.py b/lldb/test/API/python_api/debugger/TestDebuggerAPI.py
index ff1ebd96d401b..6bc6b3bcbba81 100644
--- a/lldb/test/API/python_api/debugger/TestDebuggerAPI.py
+++ b/lldb/test/API/python_api/debugger/TestDebuggerAPI.py
@@ -10,8 +10,6 @@
 
 
 class DebuggerAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_debugger_api_boundary_condition(self):

diff  --git a/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index cbfc5667a0152..20f2884a2e933 100644
--- a/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -21,8 +21,6 @@
 
 
 class APIDefaultConstructorTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_SBAddress(self):

diff  --git a/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
index 7175cf32c0b0b..677559c4a5160 100644
--- a/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
@@ -14,8 +14,6 @@
 
 class DisassembleRawDataTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfRemote
     def test_disassemble_raw_data(self):

diff  --git a/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index 61f4279e20d66..28ba4d627d697 100644
--- a/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
@@ -15,8 +15,6 @@
 
 class Disassemble_VST1_64(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     @skipIfLLVMTargetMissing("ARM")
     def test_disassemble_invalid_vst_1_64_raw_data(self):

diff  --git a/lldb/test/API/python_api/event/TestEvents.py b/lldb/test/API/python_api/event/TestEvents.py
index 69b641bf2c22e..946494f2dc242 100644
--- a/lldb/test/API/python_api/event/TestEvents.py
+++ b/lldb/test/API/python_api/event/TestEvents.py
@@ -14,8 +14,6 @@
 
 @skipIfLinux   # llvm.org/pr25924, sometimes generating SIGSEGV
 class EventAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/file_handle/TestFileHandle.py b/lldb/test/API/python_api/file_handle/TestFileHandle.py
index 5f47c31c161a9..c342047f1627d 100644
--- a/lldb/test/API/python_api/file_handle/TestFileHandle.py
+++ b/lldb/test/API/python_api/file_handle/TestFileHandle.py
@@ -80,7 +80,6 @@ def i():
 class FileHandleTestCase(lldbtest.TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = lldbtest.Base.compute_mydir(__file__)
 
     # The way normal tests evaluate debugger commands is
     # by using a SBCommandInterpreter directly, which captures

diff  --git a/lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py
index 727c11499b5d7..7dc0781446d04 100644
--- a/lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/test/API/python_api/findvalue_duplist/TestSBFrameFindValue.py
@@ -9,8 +9,6 @@
 
 
 class SBFrameFindValueTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_formatters_api(self):

diff  --git a/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
index ac135b92e3b85..45d78cdb474c1 100644
--- a/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
@@ -10,8 +10,6 @@
 
 
 class SBFormattersAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/frame/TestFrames.py b/lldb/test/API/python_api/frame/TestFrames.py
index bf2b990ccfdb5..d8721f23838b1 100644
--- a/lldb/test/API/python_api/frame/TestFrames.py
+++ b/lldb/test/API/python_api/frame/TestFrames.py
@@ -14,8 +14,6 @@
 
 class FrameAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_get_arg_vals_for_call_stack(self):
         """Exercise SBFrame.GetVariables() API to get argument vals."""
         self.build()

diff  --git a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
index 7ced4ddb98f6b..903e341b571e5 100644
--- a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
+++ b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
@@ -21,8 +21,6 @@ def get_names_from_value_list(value_list):
 
 class TestGetVariables(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
index bd1dead9979c3..34981b7b9bd4c 100644
--- a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
@@ -13,8 +13,6 @@
 
 class InlinedFrameAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
index 7eb3333c139e2..6bc65cfba4878 100644
--- a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
@@ -13,8 +13,6 @@
 
 class DisasmAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
index fe9063950d512..a1435b0b676b7 100644
--- a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
@@ -13,8 +13,6 @@
 
 class SymbolAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py b/lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py
index 025226471bd3b..d3499dac26baf 100644
--- a/lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py
+++ b/lldb/test/API/python_api/get-value-32bit-int/TestGetValue32BitInt.py
@@ -7,8 +7,6 @@
 import lldbsuite.test.lldbutil as lldbutil
 
 class TestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_with_run_command(self):

diff  --git a/lldb/test/API/python_api/hello_world/TestHelloWorld.py b/lldb/test/API/python_api/hello_world/TestHelloWorld.py
index dd9245db62702..26bc7bbded461 100644
--- a/lldb/test/API/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/test/API/python_api/hello_world/TestHelloWorld.py
@@ -11,7 +11,6 @@
 
 class HelloWorldTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         # Call super's setUp().

diff  --git a/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
index 151d445aec827..bf1fe3ffb62b2 100644
--- a/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -10,8 +10,6 @@
 
 
 class CommandInterpreterAPICase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py b/lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py
index ea3350f602ecb..5ca6f55bf7966 100644
--- a/lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py
+++ b/lldb/test/API/python_api/interpreter/TestRunCommandInterpreterAPI.py
@@ -8,7 +8,6 @@
 class CommandRunInterpreterLegacyAPICase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         TestBase.setUp(self)
@@ -44,7 +43,6 @@ def test_run_session_with_error_and_quit_legacy(self):
 class CommandRunInterpreterAPICase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         TestBase.setUp(self)
@@ -75,7 +73,6 @@ def test_run_session_with_error_and_quit(self):
 class SBCommandInterpreterRunOptionsCase(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     def test_command_interpreter_run_options(self):
         """Test SBCommandInterpreterRunOptions default values, getters & setters """

diff  --git a/lldb/test/API/python_api/lldbutil/TestSwigVersion.py b/lldb/test/API/python_api/lldbutil/TestSwigVersion.py
index 8c5c6efda5351..3e56f504b389f 100644
--- a/lldb/test/API/python_api/lldbutil/TestSwigVersion.py
+++ b/lldb/test/API/python_api/lldbutil/TestSwigVersion.py
@@ -14,8 +14,6 @@
 from lldbsuite.test.lldbtest import *
 
 class SwigVersionTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
index 2660f1a6d2798..840037948ead1 100644
--- a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
@@ -13,8 +13,6 @@
 
 class FrameUtilsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
index 9467adb6cffe3..9ae51602bf243 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -13,8 +13,6 @@
 
 class LLDBIteratorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
index 6c8c045d0e7b5..d8058f21b914b 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -13,8 +13,6 @@
 
 class RegistersIteratorTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
index 4ac7b7c46ff74..4be874d8cc44c 100644
--- a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -12,8 +12,6 @@
 
 class ThreadsStackTracesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_stack_traces(self):
         """Test SBprocess and SBThread APIs with printing of the stack traces."""
         self.build()

diff  --git a/lldb/test/API/python_api/module_section/TestModuleAndSection.py b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
index 3bb26a283adc8..403f20ab9f182 100644
--- a/lldb/test/API/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
@@ -14,8 +14,6 @@
 
 class ModuleAndSectionAPIsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Py3 asserts due to a bug in SWIG.  A fix for this was upstreamed into
     # SWIG 3.0.8.
     @skipIf(py_version=['>=', (3, 0)], swig_version=['<', (3, 0, 8)])

diff  --git a/lldb/test/API/python_api/name_lookup/TestNameLookup.py b/lldb/test/API/python_api/name_lookup/TestNameLookup.py
index c1629f9503718..a034c7721f813 100644
--- a/lldb/test/API/python_api/name_lookup/TestNameLookup.py
+++ b/lldb/test/API/python_api/name_lookup/TestNameLookup.py
@@ -13,8 +13,6 @@
 
 class TestNameLookup(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"], bugnumber='llvm.org/pr21765')
     def test_target(self):
         """Exercise SBTarget.FindFunctions() with various name masks.

diff  --git a/lldb/test/API/python_api/objc_type/TestObjCType.py b/lldb/test/API/python_api/objc_type/TestObjCType.py
index de0cd395e3b2f..0e8c546b7e58c 100644
--- a/lldb/test/API/python_api/objc_type/TestObjCType.py
+++ b/lldb/test/API/python_api/objc_type/TestObjCType.py
@@ -12,8 +12,6 @@
 
 class ObjCSBTypeTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/process/TestProcessAPI.py b/lldb/test/API/python_api/process/TestProcessAPI.py
index 6d1b3e4958837..9be2ff52e190a 100644
--- a/lldb/test/API/python_api/process/TestProcessAPI.py
+++ b/lldb/test/API/python_api/process/TestProcessAPI.py
@@ -13,8 +13,6 @@
 
 class ProcessAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/process/io/TestProcessIO.py b/lldb/test/API/python_api/process/io/TestProcessIO.py
index aae1dfe0be83f..fa6a434a24503 100644
--- a/lldb/test/API/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/API/python_api/process/io/TestProcessIO.py
@@ -11,8 +11,6 @@
 
 
 class ProcessIOTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setup_test(self):

diff  --git a/lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py b/lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py
index df92849e9198f..beda712f49c7a 100644
--- a/lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py
+++ b/lldb/test/API/python_api/process/read-mem-cstring/TestReadMemCString.py
@@ -9,8 +9,6 @@
 
 
 class TestReadMemCString(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_read_memory_c_string(self):

diff  --git a/lldb/test/API/python_api/sbdata/TestSBData.py b/lldb/test/API/python_api/sbdata/TestSBData.py
index aced0dad0d85f..ae873129e219f 100644
--- a/lldb/test/API/python_api/sbdata/TestSBData.py
+++ b/lldb/test/API/python_api/sbdata/TestSBData.py
@@ -10,8 +10,6 @@
 
 
 class SBDataAPICase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py b/lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py
index 99369f8a1e8ce..dfd919b40eb5d 100644
--- a/lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py
+++ b/lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py
@@ -9,8 +9,6 @@
 from lldbsuite.test import lldbutil
 
 class SBEnvironmentAPICase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # We use this function to test both kind of accessors:

diff  --git a/lldb/test/API/python_api/sberror/TestSBError.py b/lldb/test/API/python_api/sberror/TestSBError.py
index aa798ba48730b..a36ffddd9a4b7 100644
--- a/lldb/test/API/python_api/sberror/TestSBError.py
+++ b/lldb/test/API/python_api/sberror/TestSBError.py
@@ -3,8 +3,6 @@
 from lldbsuite.test.lldbtest import *
 
 class TestSBError(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_generic_error(self):

diff  --git a/lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py b/lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py
index 44a6362ce924c..256a7418cf9d2 100644
--- a/lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py
+++ b/lldb/test/API/python_api/sblaunchinfo/TestSBLaunchInfo.py
@@ -16,8 +16,6 @@ def lookup(info, key):
     return ""
 
 class TestSBLaunchInfo(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_environment_getset(self):

diff  --git a/lldb/test/API/python_api/sbmodule/TestSBModule.py b/lldb/test/API/python_api/sbmodule/TestSBModule.py
index 01bb2ba6003ef..046c9abddd18c 100644
--- a/lldb/test/API/python_api/sbmodule/TestSBModule.py
+++ b/lldb/test/API/python_api/sbmodule/TestSBModule.py
@@ -9,8 +9,6 @@
 
 class SBModuleAPICase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.background_pid = None

diff  --git a/lldb/test/API/python_api/sbplatform/TestSBPlatform.py b/lldb/test/API/python_api/sbplatform/TestSBPlatform.py
index dbb3f4ca5db1c..aa0bc672d1a74 100644
--- a/lldb/test/API/python_api/sbplatform/TestSBPlatform.py
+++ b/lldb/test/API/python_api/sbplatform/TestSBPlatform.py
@@ -4,8 +4,6 @@
 from lldbsuite.test.lldbtest import *
 
 class SBPlatformAPICase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote # Remote environment not supported.

diff  --git a/lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py b/lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py
index c15f0f3586275..7bbc0fed2648d 100644
--- a/lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py
+++ b/lldb/test/API/python_api/sbstructureddata/TestStructuredDataAPI.py
@@ -11,8 +11,6 @@
 
 
 class TestStructuredDataAPI(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

diff  --git a/lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py
index 8324d236a469a..d4ce793e972b5 100644
--- a/lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/test/API/python_api/sbvalue_persist/TestSBValuePersist.py
@@ -9,8 +9,6 @@
 
 
 class SBValuePersistTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24772")

diff  --git a/lldb/test/API/python_api/section/TestSectionAPI.py b/lldb/test/API/python_api/section/TestSectionAPI.py
index bd8e45164a16e..51a003701924d 100644
--- a/lldb/test/API/python_api/section/TestSectionAPI.py
+++ b/lldb/test/API/python_api/section/TestSectionAPI.py
@@ -11,8 +11,6 @@
 
 class SectionAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_get_target_byte_size(self):
         d = {'EXE': 'b.out'}
         self.build(dictionary=d)

diff  --git a/lldb/test/API/python_api/signals/TestSignalsAPI.py b/lldb/test/API/python_api/signals/TestSignalsAPI.py
index 6c535d7e759eb..f3c459d215dae 100644
--- a/lldb/test/API/python_api/signals/TestSignalsAPI.py
+++ b/lldb/test/API/python_api/signals/TestSignalsAPI.py
@@ -12,7 +12,6 @@
 
 
 class SignalsAPITestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfWindows  # Windows doesn't have signals

diff  --git a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
index 69abb8fa4863f..e6ec78e9af941 100644
--- a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
@@ -12,8 +12,6 @@
 
 class SymbolContextAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
index 8188c733d65f3..c4e7d74373477 100644
--- a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
+++ b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
@@ -12,8 +12,6 @@
 
 class SymbolContextTwoFilesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"])
     def test_lookup_by_address(self):
         """Test lookup by address in a module with multiple compilation units"""

diff  --git a/lldb/test/API/python_api/target/TestTargetAPI.py b/lldb/test/API/python_api/target/TestTargetAPI.py
index 2ae9d44263038..e24f0b568d993 100644
--- a/lldb/test/API/python_api/target/TestTargetAPI.py
+++ b/lldb/test/API/python_api/target/TestTargetAPI.py
@@ -15,8 +15,6 @@
 
 class TargetAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py
index 91e635c3994ac..612c47e6fa123 100644
--- a/lldb/test/API/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/API/python_api/thread/TestThreadAPI.py
@@ -14,8 +14,6 @@
 
 class ThreadAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_get_process(self):
         """Test Python SBThread.GetProcess() API."""
         self.build()

diff  --git a/lldb/test/API/python_api/type/TestTypeList.py b/lldb/test/API/python_api/type/TestTypeList.py
index 41c249bfd7190..9d465bde5fab0 100644
--- a/lldb/test/API/python_api/type/TestTypeList.py
+++ b/lldb/test/API/python_api/type/TestTypeList.py
@@ -14,8 +14,6 @@
 
 class TypeAndTypeListTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py
index 7ba9c44bb8eb4..b75b4ef8899be 100644
--- a/lldb/test/API/python_api/value/TestValueAPI.py
+++ b/lldb/test/API/python_api/value/TestValueAPI.py
@@ -13,8 +13,6 @@
 
 class ValueAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
index 3e2d3c630989f..0d602d8557d69 100644
--- a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
@@ -12,8 +12,6 @@
 
 class ChangeValueAPITestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
index f4a3f5a0f7e6a..9cbed282bd4d4 100644
--- a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
+++ b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
@@ -6,8 +6,6 @@
 
 class ValueAPIEmptyClassTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         self.build()
         exe = self.getBuildArtifact("a.out")

diff  --git a/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
index 5bc7475bacd2b..8001cfb69d07a 100644
--- a/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -13,8 +13,6 @@
 
 
 class ValueAsLinkedListTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
index e7d47de69c601..cbc91356ec12c 100644
--- a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
@@ -10,8 +10,6 @@
 
 class ValueVarUpdateTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_with_process_launch_api(self):
         """Test SBValue::GetValueDidChange"""
         # Get the full path to our executable to be attached/debugged.

diff  --git a/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
index 8d06b3dbab0e6..829054e55ffc5 100644
--- a/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
@@ -12,8 +12,6 @@
 
 
 class SetWatchpointAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
index 750e3dcef4b90..7c33dec38facc 100644
--- a/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -12,8 +12,6 @@
 
 
 class WatchpointIgnoreCountTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
index 0dc3f49a3ebb3..7b83cfac05ed6 100644
--- a/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
@@ -13,8 +13,6 @@
 
 
 class WatchpointIteratorTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # hardware watchpoints are not reported with a hardware index # on armv7 on ios devices

diff  --git a/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 5230f16b41ba6..585a936b73a1e 100644
--- a/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -12,8 +12,6 @@
 
 
 class WatchpointConditionAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 8b2682a3bc74e..7cbc6a54f5d23 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -13,8 +13,6 @@
 
 
 class SetWatchlocationAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index ca32300054c36..e41d65a3adef8 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -12,8 +12,6 @@
 
 
 class TargetWatchAddressAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/qemu/TestQemuAPI.py b/lldb/test/API/qemu/TestQemuAPI.py
index b0341dde7501b..2ef5bb3854d59 100644
--- a/lldb/test/API/qemu/TestQemuAPI.py
+++ b/lldb/test/API/qemu/TestQemuAPI.py
@@ -7,8 +7,6 @@
 
 @skipIfRemote
 class TestQemuAPI(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_file_api(self):

diff  --git a/lldb/test/API/qemu/TestQemuLaunch.py b/lldb/test/API/qemu/TestQemuLaunch.py
index afa158339b6e4..072efe6f0e456 100644
--- a/lldb/test/API/qemu/TestQemuLaunch.py
+++ b/lldb/test/API/qemu/TestQemuLaunch.py
@@ -15,8 +15,6 @@
 @skipIfRemote
 @skipIfWindows
 class TestQemuLaunch(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def set_emulator_setting(self, name, value):

diff  --git a/lldb/test/API/repl/clang/TestClangREPL.py b/lldb/test/API/repl/clang/TestClangREPL.py
index 9ad67af74f9d8..2b8dfb6dc7b8f 100644
--- a/lldb/test/API/repl/clang/TestClangREPL.py
+++ b/lldb/test/API/repl/clang/TestClangREPL.py
@@ -5,8 +5,6 @@
 
 class TestCase(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def expect_repl(self, expr, substrs=[]):
         """ Evaluates the expression in the REPL and verifies that the list
         of substrs is in the REPL output."""

diff  --git a/lldb/test/API/sample_test/TestSampleTest.py b/lldb/test/API/sample_test/TestSampleTest.py
index 6d53f6153cba8..e4e2cec47c32f 100644
--- a/lldb/test/API/sample_test/TestSampleTest.py
+++ b/lldb/test/API/sample_test/TestSampleTest.py
@@ -11,8 +11,6 @@
 
 class RenameThisSampleTestTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # If your test case doesn't stress debug info, then
     # set this to true.  That way it won't be run once for
     # each debug info format.

diff  --git a/lldb/test/API/sanity/TestModuleCacheSanity.py b/lldb/test/API/sanity/TestModuleCacheSanity.py
index 3d9f171cabace..ca21d6860e6c1 100644
--- a/lldb/test/API/sanity/TestModuleCacheSanity.py
+++ b/lldb/test/API/sanity/TestModuleCacheSanity.py
@@ -11,8 +11,6 @@
 
 class ModuleCacheSanityTestCase(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   NO_DEBUG_INFO_TESTCASE = True
 
   def test(self):

diff  --git a/lldb/test/API/sanity/TestReprStrEquality.py b/lldb/test/API/sanity/TestReprStrEquality.py
index 798c0f6d7eb8a..51a4beb9a2034 100644
--- a/lldb/test/API/sanity/TestReprStrEquality.py
+++ b/lldb/test/API/sanity/TestReprStrEquality.py
@@ -10,8 +10,6 @@
 
 class TestCase(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   NO_DEBUG_INFO_TESTCASE = True
 
   def test(self):

diff  --git a/lldb/test/API/sanity/TestSettingSkipping.py b/lldb/test/API/sanity/TestSettingSkipping.py
index 206c7b4ecd730..4e05446d0276d 100644
--- a/lldb/test/API/sanity/TestSettingSkipping.py
+++ b/lldb/test/API/sanity/TestSettingSkipping.py
@@ -10,8 +10,6 @@
 
 class SettingSkipSanityTestCase(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   NO_DEBUG_INFO_TESTCASE = True
 
   @skipIf(setting=('target.prefer-dynamic-value', 'no-dynamic-values'))

diff  --git a/lldb/test/API/source-manager/TestSourceManager.py b/lldb/test/API/source-manager/TestSourceManager.py
index 888174a62f19b..a44f0bbbc174e 100644
--- a/lldb/test/API/source-manager/TestSourceManager.py
+++ b/lldb/test/API/source-manager/TestSourceManager.py
@@ -26,8 +26,6 @@ def ansi_color_surround_regex(inner_regex_text):
 
 class SourceManagerTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff  --git a/lldb/test/API/symbol_ondemand/breakpoint_language/TestBreakpointLanguageOnDemand.py b/lldb/test/API/symbol_ondemand/breakpoint_language/TestBreakpointLanguageOnDemand.py
index 38d438648c557..78f7b400e935f 100644
--- a/lldb/test/API/symbol_ondemand/breakpoint_language/TestBreakpointLanguageOnDemand.py
+++ b/lldb/test/API/symbol_ondemand/breakpoint_language/TestBreakpointLanguageOnDemand.py
@@ -12,8 +12,6 @@
 
 class TestBreakpointLanguage(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_location_file(self, bp, loc, test_name):
         bp_loc = bp.GetLocationAtIndex(loc)
         addr = bp_loc.GetAddress()

diff  --git a/lldb/test/API/symbol_ondemand/breakpoint_source_regex/TestSourceTextRegexBreakpoint.py b/lldb/test/API/symbol_ondemand/breakpoint_source_regex/TestSourceTextRegexBreakpoint.py
index 4fd3bbf74bf07..453213956b6e7 100644
--- a/lldb/test/API/symbol_ondemand/breakpoint_source_regex/TestSourceTextRegexBreakpoint.py
+++ b/lldb/test/API/symbol_ondemand/breakpoint_source_regex/TestSourceTextRegexBreakpoint.py
@@ -11,7 +11,6 @@
 
 
 class TestSourceTextRegexBreakpoint(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIfWindows
     def test_with_run_command(self):

diff  --git a/lldb/test/API/symbol_ondemand/shared_library/TestSharedLibOnDemand.py b/lldb/test/API/symbol_ondemand/shared_library/TestSharedLibOnDemand.py
index dd14594159474..97f89c11e965d 100644
--- a/lldb/test/API/symbol_ondemand/shared_library/TestSharedLibOnDemand.py
+++ b/lldb/test/API/symbol_ondemand/shared_library/TestSharedLibOnDemand.py
@@ -10,8 +10,6 @@
 
 class SharedLibTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/terminal/TestEditline.py b/lldb/test/API/terminal/TestEditline.py
index 26e43a2090cc4..baa801397a8e4 100644
--- a/lldb/test/API/terminal/TestEditline.py
+++ b/lldb/test/API/terminal/TestEditline.py
@@ -13,8 +13,6 @@
 
 class EditlineTest(PExpectTest):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfAsan
     @skipIfEditlineSupportMissing
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"])

diff  --git a/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
index 348cdcb026293..51147101ab568 100644
--- a/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
@@ -15,8 +15,6 @@
 
 class TestSTTYBeforeAndAfter(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @classmethod
     def classCleanup(cls):
         """Cleanup the test byproducts."""

diff  --git a/lldb/test/API/test_utils/TestDecorators.py b/lldb/test/API/test_utils/TestDecorators.py
index f536f4255656c..97d144b6d4441 100644
--- a/lldb/test/API/test_utils/TestDecorators.py
+++ b/lldb/test/API/test_utils/TestDecorators.py
@@ -3,8 +3,6 @@
 
 
 class TestDecorators(Base):
-
-    mydir = Base.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(debug_info="dwarf")

diff  --git a/lldb/test/API/test_utils/TestInlineTest.py b/lldb/test/API/test_utils/TestInlineTest.py
index 21a3e2fd4bf2a..d2371096de613 100644
--- a/lldb/test/API/test_utils/TestInlineTest.py
+++ b/lldb/test/API/test_utils/TestInlineTest.py
@@ -5,8 +5,6 @@
 
 class TestCommandParser(Base):
 
-    mydir = Base.compute_mydir(__file__)
-
     def test_indentation(self):
         """Test indentation handling"""
         filename = self.getBuildArtifact("test_file.cpp")

diff  --git a/lldb/test/API/test_utils/TestPExpectTest.py b/lldb/test/API/test_utils/TestPExpectTest.py
index 6e96b1d0108d2..584d8fb5ec308 100644
--- a/lldb/test/API/test_utils/TestPExpectTest.py
+++ b/lldb/test/API/test_utils/TestPExpectTest.py
@@ -5,8 +5,6 @@
 from lldbsuite.test.lldbpexpect import *
 
 class TestPExpectTestCase(PExpectTest):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def assert_expect_fails_with(self, cmd, expect_args, expected_msg):

diff  --git a/lldb/test/API/test_utils/base/TestBaseTest.py b/lldb/test/API/test_utils/base/TestBaseTest.py
index 4aceca7d5fb57..7f0ce1cc02823 100644
--- a/lldb/test/API/test_utils/base/TestBaseTest.py
+++ b/lldb/test/API/test_utils/base/TestBaseTest.py
@@ -8,8 +8,6 @@
 
 class TestBuildMethod(Base):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         super().setUp()
         self._traces = []

diff  --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
index a9fe3af3d21f1..149902e3bb5c1 100644
--- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
+++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
@@ -10,8 +10,6 @@
 
 class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Number of stderr lines to read from the simctl output.
     READ_LINES = 10
 

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
index dd427b66ca894..9de14011f0bf3 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
@@ -6,8 +6,6 @@
 
 class TestGdbRemoteAttach(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_attach_with_vAttach(self):
         self.build()
         self.set_inferior_startup_attach_manually()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachOrWait.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachOrWait.py
index ded3ff6f849b6..90a7eee7536f8 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachOrWait.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachOrWait.py
@@ -11,8 +11,6 @@
 
 class TestGdbRemoteAttachOrWait(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # This test is flaky on Windows
     def test_launch_before_attach_with_vAttachOrWait(self):
         exe = '%s_%d' % (self.testMethodName, os.getpid())

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachWait.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachWait.py
index 980bcb9c9d7c0..ed31b5645c336 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachWait.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttachWait.py
@@ -11,8 +11,6 @@
 
 class TestGdbRemoteAttachWait(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # This test is flaky on Windows
     def test_attach_with_vAttachWait(self):
         exe = '%s_%d' % (self.testMethodName, os.getpid())

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index 9d0c9db3b950a..ac9c7fe9049c0 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -5,8 +5,6 @@
 
 class TestGdbRemoteAuxvSupport(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     AUXV_SUPPORT_FEATURE_NAME = "qXfer:auxv:read"
 
     def has_auxv_support(self):

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteCompletion.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteCompletion.py
index 064aefe8d94cd..820bdab6e8503 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteCompletion.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteCompletion.py
@@ -5,7 +5,6 @@
 from lldbgdbserverutils import *
 
 class GdbRemoteCompletionTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def init_lldb_server(self):
         self.debug_monitor_exe = get_lldb_server_exe()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
index 961409d3fec2f..a175024a1b57e 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
@@ -10,8 +10,6 @@
 
 class TestGdbRemoteExitCode(GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def _test_inferior_exit(self, retval):
         self.build()
 

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index d6b9238156c55..14368f98a276a 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -6,8 +6,6 @@
 
 class TestGdbRemoteExpeditedRegisters(
         gdbremote_testcase.GdbRemoteTestCaseBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def gather_expedited_registers(self):
         # Setup the stub and set the gdb remote command stream.

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteFork.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteFork.py
index 88ef72a06a6db..3ce10f5964b8e 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteFork.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteFork.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestGdbRemoteFork(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @add_test_categories(["fork"])
     def test_fork_multithreaded(self):

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
index 9332cc1163fb7..59db1907e8160 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
@@ -11,8 +11,6 @@
 
 class TestGdbRemoteHostInfo(GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     KNOWN_HOST_INFO_KEYS = set([
         "addressing_bits",
         "arch",

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
index 98f07f3014e06..1d07a68f12c79 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
@@ -9,8 +9,6 @@
 
 class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_attach_commandline_kill_after_initial_stop(self):
         self.build()
         self.set_inferior_startup_attach()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
index bab097c313650..bad9e871f648f 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
@@ -10,8 +10,6 @@
 
 class TestGdbRemoteModuleInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["llgs"])
     def test_module_info(self):
         self.build()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py b/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
index af017632b444c..57b2daf96143f 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
@@ -45,8 +45,6 @@ def uint32_trunc(x):
 
 class TestGdbRemotePlatformFile(GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @add_test_categories(["llgs"])
     def test_platform_file_rdonly(self):

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
index d1b4e5e3a7868..86c9e75ae711c 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -7,8 +7,6 @@
 
 class TestGdbRemoteProcessInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_qProcessInfo_returns_running_process(self):
         self.build()
         procs = self.prep_debug_monitor_and_inferior()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
index e3784f46d78f4..241bf92a6dee9 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -7,8 +7,6 @@
 class TestGdbRemoteRegisterState(gdbremote_testcase.GdbRemoteTestCaseBase):
     """Test QSaveRegisterState/QRestoreRegisterState support."""
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def grp_register_save_restore_works(self, with_suffix):
         # Start up the process, use thread suffix, grab main thread id.
         inferior_args = ["message:main entered", "sleep:5"]

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteSaveCore.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteSaveCore.py
index 995d10534faf2..b51c386b23b42 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteSaveCore.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteSaveCore.py
@@ -7,7 +7,6 @@
 import os
 
 class TestGdbSaveCore(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def coredump_test(self, core_path=None, expect_path=None):
         self.build()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
index 2716390da8288..5665e18e73856 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -6,8 +6,6 @@
 
 class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows # No pty support to test any inferior std -i/e/o
     @skipIf(triple='^mips')
     def test_single_step_only_steps_one_instruction_with_s(self):

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index 11ebba8275154..c41446f96b8d7 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -9,8 +9,6 @@
 class TestGdbRemoteThreadsInStopReply(
         gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     ENABLE_THREADS_IN_STOP_REPLY_ENTRIES = [
         "read packet: $QListThreadsInStopReply#21",
         "send packet: $OK#00",

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 8fe3f777205a8..e8d44e32deb31 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -5,8 +5,6 @@
 from lldbsuite.test import lldbutil
 
 class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     THREAD_COUNT = 5
 
     def gather_stop_replies_via_qThreadStopInfo(self, threads):

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
index 3621a6a497a63..db1e39b9759d7 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
@@ -5,8 +5,6 @@
 
 class TestGdbRemote_vCont(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def vCont_supports_mode(self, mode, inferior_args=None):
         # Setup the stub and set the gdb remote command stream.
         procs = self.prep_debug_monitor_and_inferior(

diff  --git a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
index eb1ed026c9b63..c967f708c4521 100644
--- a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
@@ -26,8 +26,6 @@
 
 class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase, DwarfOpcodeParser):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_thread_suffix_supported(self):
         server = self.connect_to_debug_monitor()
         self.assertIsNotNone(server)

diff  --git a/lldb/test/API/tools/lldb-server/TestPtyServer.py b/lldb/test/API/tools/lldb-server/TestPtyServer.py
index 44aa2f1e15aeb..f5aa0ad74751d 100644
--- a/lldb/test/API/tools/lldb-server/TestPtyServer.py
+++ b/lldb/test/API/tools/lldb-server/TestPtyServer.py
@@ -9,7 +9,6 @@
 
 @skipIfWindows
 class PtyServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def setUp(self):
         super().setUp()

diff  --git a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
index 514e5539fd948..2bbfb2783f3e6 100644
--- a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
+++ b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
@@ -126,8 +126,6 @@ def close(self):
 
 class TestGdbRemoteConnection(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote  # reverse connect is not a supported use case for now
     def test_reverse_connect(self):
         # Reverse connect is the default connection method.

diff  --git a/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
index 8a001191a391c..33427142f88bb 100644
--- a/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
@@ -8,8 +8,6 @@
 
 class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def get_stub_sid(self, extra_stub_args=None):
         # Launch debugserver
         if extra_stub_args:

diff  --git a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 95f552822dfc0..cd51741bca1e1 100644
--- a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestGdbRemoteAbort(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIfWindows # No signal is sent on Windows.
     # std::abort() on <= API 16 raises SIGSEGV - b.android.com/179836

diff  --git a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 6bcf7f0860e5e..9a057d0e15391 100644
--- a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -4,7 +4,6 @@
 from lldbsuite.test import lldbutil
 
 class TestGdbRemoteSegFault(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     GDB_REMOTE_STOP_CODE_BAD_ACCESS = 0x91
 

diff  --git a/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py b/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
index 943a06051a095..7d93d66570905 100644
--- a/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
+++ b/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
@@ -5,8 +5,6 @@
 
 class TestGdbRemoteLibrariesSvr4Support(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     FEATURE_NAME = "qXfer:libraries-svr4:read"
 
     def setup_test(self):

diff  --git a/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py b/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
index 351225f69c2f0..2ab6820c09203 100644
--- a/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
+++ b/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
@@ -8,8 +8,6 @@
 
 class TestGdbRemoteMemoryAllocation(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def allocate(self, size, permissions):
         self.test_sequence.add_log_lines(["read packet: $_M{:x},{}#00".format(size, permissions),
                                           {"direction": "send",

diff  --git a/lldb/test/API/tools/lldb-server/memory-tagging/TestGdbRemoteMemoryTagging.py b/lldb/test/API/tools/lldb-server/memory-tagging/TestGdbRemoteMemoryTagging.py
index 983e1aa54b327..ceb4a35e23c0e 100644
--- a/lldb/test/API/tools/lldb-server/memory-tagging/TestGdbRemoteMemoryTagging.py
+++ b/lldb/test/API/tools/lldb-server/memory-tagging/TestGdbRemoteMemoryTagging.py
@@ -16,8 +16,6 @@
 
 class TestGdbRemoteMemoryTagging(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_memtags_response(self, packet_name, body, expected):
         self.test_sequence.add_log_lines(["read packet: ${}:{}#00".format(packet_name, body),
                                           "send packet: ${}#00".format(expected),

diff  --git a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
index 2e02a2ccacf7b..bbb0321ceb3b8 100644
--- a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
+++ b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
@@ -24,8 +24,6 @@ def _extract_register_value(reg_info, reg_bank, byte_order, bytes_per_entry=8):
 
 class TestGdbRemoteGPacket(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfOutOfTreeDebugserver
     @skipUnlessDarwin # G packet not supported
     def test_g_packet(self):

diff  --git a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
index bfa7babb7dcec..96eddf6ceae14 100644
--- a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
+++ b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
@@ -10,8 +10,6 @@
 
 class TestGdbRemoteTargetXmlPacket(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @llgs_test
     def test_g_target_xml_returns_correct_data(self):
         self.build()

diff  --git a/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py b/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
index ccdfb9b44482d..7acb0188dcff7 100644
--- a/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
+++ b/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
@@ -8,8 +8,6 @@
 
 class TestGdbRemote_QPassSignals(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def expect_signal(self, expected_signo):
         self.test_sequence.add_log_lines(["read packet: $vCont;c#a8",
                                           {"direction": "send",

diff  --git a/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py b/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
index 469e5e5fedf2f..af563af158ce2 100644
--- a/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
+++ b/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
@@ -5,8 +5,6 @@
 
 class TestGdbRemoteThreadName(gdbremote_testcase.GdbRemoteTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def run_and_check_name(self, expected_name):
         self.test_sequence.add_log_lines(["read packet: $vCont;c#a8",
                                           {"direction": "send",

diff  --git a/lldb/test/API/tools/lldb-server/vCont-threads/TestGdbRemote_vContThreads.py b/lldb/test/API/tools/lldb-server/vCont-threads/TestGdbRemote_vContThreads.py
index 10d4f168789c8..30a136f127787 100644
--- a/lldb/test/API/tools/lldb-server/vCont-threads/TestGdbRemote_vContThreads.py
+++ b/lldb/test/API/tools/lldb-server/vCont-threads/TestGdbRemote_vContThreads.py
@@ -7,7 +7,6 @@
 from lldbsuite.test import lldbutil
 
 class TestGdbRemote_vContThreads(gdbremote_testcase.GdbRemoteTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def start_threads(self, num):
         procs = self.prep_debug_monitor_and_inferior(inferior_args=[str(num)])

diff  --git a/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py b/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py
index 1eee182916100..cda935ff70c3f 100644
--- a/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py
+++ b/lldb/test/API/tools/lldb-vscode/attach/TestVSCode_attach.py
@@ -29,8 +29,6 @@ def spawn_and_wait(program, delay):
 
 class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def set_and_hit_breakpoint(self, continueToExit=True):
         source = 'main.c'
         breakpoint1_line = line_number(source, '// breakpoint 1')

diff  --git a/lldb/test/API/tools/lldb-vscode/breakpoint-events/TestVSCode_breakpointEvents.py b/lldb/test/API/tools/lldb-vscode/breakpoint-events/TestVSCode_breakpointEvents.py
index 825fcd2f7d969..483684e562ef7 100644
--- a/lldb/test/API/tools/lldb-vscode/breakpoint-events/TestVSCode_breakpointEvents.py
+++ b/lldb/test/API/tools/lldb-vscode/breakpoint-events/TestVSCode_breakpointEvents.py
@@ -14,8 +14,6 @@
 
 class TestVSCode_breakpointEvents(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipUnlessDarwin
     def test_breakpoint_events(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py
index 626a6536d6b96..a6269f4840251 100644
--- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py
+++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setBreakpoints.py
@@ -15,8 +15,6 @@
 
 class TestVSCode_setBreakpoints(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         lldbvscode_testcase.VSCodeTestCaseBase.setUp(self)
 

diff  --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py
index ff64e448278ad..e7fced08857a9 100644
--- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setExceptionBreakpoints.py
@@ -14,8 +14,6 @@
 class TestVSCode_setExceptionBreakpoints(
         lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     def test_functionality(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
index 651a7071a5a7b..159b2ca225467 100644
--- a/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
@@ -14,8 +14,6 @@
 class TestVSCode_setFunctionBreakpoints(
         lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     def test_set_and_clear(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py b/lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py
index 06ab8f4145491..836a8619ca9ef 100644
--- a/lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py
+++ b/lldb/test/API/tools/lldb-vscode/completions/TestVSCode_completions.py
@@ -13,8 +13,6 @@
 
 class TestVSCode_variables(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def verify_completions(self, actual_list, expected_list, not_expected_list=[]):
         for expected_item in expected_list:
             self.assertIn(expected_item, actual_list)

diff  --git a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
index f36b8e24b453c..ae71775901ed8 100644
--- a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
+++ b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
@@ -14,8 +14,6 @@
 
 class TestVSCode_console(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def check_lldb_command(self, lldb_command, contains_string, assert_msg):
         response = self.vscode.request_evaluate('`%s' % (lldb_command))
         output = response['body']['result']

diff  --git a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_redirection_to_console.py b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_redirection_to_console.py
index 1e028e55d18c3..1ce7b1fa6761c 100644
--- a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_redirection_to_console.py
+++ b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_redirection_to_console.py
@@ -9,8 +9,6 @@
 
 class TestVSCode_redirection_to_console(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     def test(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/coreFile/TestVSCode_coreFile.py b/lldb/test/API/tools/lldb-vscode/coreFile/TestVSCode_coreFile.py
index b73357f075adf..344671d53670c 100644
--- a/lldb/test/API/tools/lldb-vscode/coreFile/TestVSCode_coreFile.py
+++ b/lldb/test/API/tools/lldb-vscode/coreFile/TestVSCode_coreFile.py
@@ -14,8 +14,6 @@
 
 class TestVSCode_coreFile(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     @skipIfLLVMTargetMissing("X86")

diff  --git a/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py b/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
index 4b7b03745692e..95a97500ed808 100644
--- a/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
+++ b/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
@@ -14,8 +14,6 @@
 
 class TestVSCode_correct_thread(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     def test_correct_thread(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/disconnect/TestVSCode_disconnect.py b/lldb/test/API/tools/lldb-vscode/disconnect/TestVSCode_disconnect.py
index dd4f69855f2d3..24054e7d4d099 100644
--- a/lldb/test/API/tools/lldb-vscode/disconnect/TestVSCode_disconnect.py
+++ b/lldb/test/API/tools/lldb-vscode/disconnect/TestVSCode_disconnect.py
@@ -15,8 +15,6 @@
 
 
 class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     source = 'main.cpp'
 
     def disconnect_and_assert_no_output_printed(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/evaluate/TestVSCode_evaluate.py b/lldb/test/API/tools/lldb-vscode/evaluate/TestVSCode_evaluate.py
index fdd5c47398d00..4a6e261250f57 100644
--- a/lldb/test/API/tools/lldb-vscode/evaluate/TestVSCode_evaluate.py
+++ b/lldb/test/API/tools/lldb-vscode/evaluate/TestVSCode_evaluate.py
@@ -12,8 +12,6 @@
 
 class TestVSCode_variables(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def assertEvaluate(self, expression, regex):
         self.assertRegexpMatches(
             self.vscode.request_evaluate(expression, context=self.context)['body']['result'],

diff  --git a/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py b/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py
index 8c0000bdb1546..e80850002c565 100644
--- a/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py
+++ b/lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py
@@ -15,8 +15,6 @@
 
 class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfDarwin # Flaky
     @skipIfRemote

diff  --git a/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py b/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
index 7f29ec6c03ecd..f3227de6513df 100644
--- a/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
+++ b/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
@@ -14,8 +14,6 @@
 
 class TestVSCode_module(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def run_test(self, symbol_basename, expect_debug_info_size):
         program_basename = "a.out.stripped"
         program = self.getBuildArtifact(program_basename)

diff  --git a/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py b/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
index a5e40d03abe44..e78a0a21603f0 100644
--- a/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
+++ b/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
@@ -13,7 +13,6 @@
 
 
 class TestVSCode_optimized(lldbvscode_testcase.VSCodeTestCaseBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @skipIfWindows
     @skipIfRemote

diff  --git a/lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py b/lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py
index 047cc317596f2..4731d13821a5c 100644
--- a/lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py
+++ b/lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py
@@ -19,8 +19,6 @@
 
 class TestVSCode_runInTerminal(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def readPidMessage(self, fifo_file):
         with open(fifo_file, "r") as file:
             self.assertIn("pid", file.readline())

diff  --git a/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py b/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py
index 153fb9af0bb59..994e5c3fa104e 100644
--- a/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py
+++ b/lldb/test/API/tools/lldb-vscode/stackTrace/TestVSCode_stackTrace.py
@@ -13,8 +13,6 @@
 
 
 class TestVSCode_stackTrace(lldbvscode_testcase.VSCodeTestCaseBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     name_key_path = ['name']
     source_key_path = ['source', 'path']
     line_key_path = ['line']

diff  --git a/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py b/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py
index dbd7ef8499d87..7eba62940e7ba 100644
--- a/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py
+++ b/lldb/test/API/tools/lldb-vscode/step/TestVSCode_step.py
@@ -13,8 +13,6 @@
 
 class TestVSCode_step(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfWindows
     @skipIfRemote
     def test_step(self):

diff  --git a/lldb/test/API/tools/lldb-vscode/stop-hooks/TestVSCode_stop_hooks.py b/lldb/test/API/tools/lldb-vscode/stop-hooks/TestVSCode_stop_hooks.py
index c6be1a013a80a..28781fbb42613 100644
--- a/lldb/test/API/tools/lldb-vscode/stop-hooks/TestVSCode_stop_hooks.py
+++ b/lldb/test/API/tools/lldb-vscode/stop-hooks/TestVSCode_stop_hooks.py
@@ -10,8 +10,6 @@
 
 class TestVSCode_stop_hooks(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfRemote
     def test_stop_hooks_before_run(self):
         '''

diff  --git a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
index 2a473df67c78a..dbe11ca2af8dd 100644
--- a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
+++ b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
@@ -21,8 +21,6 @@ def make_buffer_verify_dict(start_idx, count, offset=0):
 
 class TestVSCode_variables(lldbvscode_testcase.VSCodeTestCaseBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def verify_values(self, verify_dict, actual, varref_dict=None, expression=None):
         if 'equals' in verify_dict:
             verify = verify_dict['equals']

diff  --git a/lldb/test/API/types/HideTestFailures.py b/lldb/test/API/types/HideTestFailures.py
index 91b1383b72f23..3f4d916a83a3e 100644
--- a/lldb/test/API/types/HideTestFailures.py
+++ b/lldb/test/API/types/HideTestFailures.py
@@ -15,8 +15,6 @@
 
 class DebugIntegerTypesFailures(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/types/TestCharType.py b/lldb/test/API/types/TestCharType.py
index 9ba49fd96b1a6..735e050dd8298 100644
--- a/lldb/test/API/types/TestCharType.py
+++ b/lldb/test/API/types/TestCharType.py
@@ -9,8 +9,6 @@
 
 class CharTypeTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_char_type(self):
         """Test that char-type variables are displayed correctly."""
         self.build_and_run('char.cpp', ['char'], qd=True)

diff  --git a/lldb/test/API/types/TestCharTypeExpr.py b/lldb/test/API/types/TestCharTypeExpr.py
index b1708f25d260f..96af397713d59 100644
--- a/lldb/test/API/types/TestCharTypeExpr.py
+++ b/lldb/test/API/types/TestCharTypeExpr.py
@@ -9,8 +9,6 @@
 
 class CharTypeExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_char_type(self):
         """Test that char-type variable expressions are evaluated correctly."""
         self.build_and_run_expr('char.cpp', ['char'], qd=True)

diff  --git a/lldb/test/API/types/TestDoubleTypes.py b/lldb/test/API/types/TestDoubleTypes.py
index adce103cb084f..d2006e4867174 100644
--- a/lldb/test/API/types/TestDoubleTypes.py
+++ b/lldb/test/API/types/TestDoubleTypes.py
@@ -14,8 +14,6 @@
 
 class DoubleTypesTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_double_type(self):
         """Test that double-type variables are displayed correctly."""
         self.build_and_run('double.cpp', set(['double']))

diff  --git a/lldb/test/API/types/TestDoubleTypesExpr.py b/lldb/test/API/types/TestDoubleTypesExpr.py
index 20c54100021e0..a6b06ab44c7a9 100644
--- a/lldb/test/API/types/TestDoubleTypesExpr.py
+++ b/lldb/test/API/types/TestDoubleTypesExpr.py
@@ -14,8 +14,6 @@
 
 class DoubleTypesExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?

diff  --git a/lldb/test/API/types/TestFloatTypes.py b/lldb/test/API/types/TestFloatTypes.py
index 7377552265880..ed2212829f2d4 100644
--- a/lldb/test/API/types/TestFloatTypes.py
+++ b/lldb/test/API/types/TestFloatTypes.py
@@ -14,8 +14,6 @@
 
 class FloatTypesTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_float_type(self):
         """Test that float-type variables are displayed correctly."""
         self.build_and_run('float.cpp', set(['float']))

diff  --git a/lldb/test/API/types/TestFloatTypesExpr.py b/lldb/test/API/types/TestFloatTypesExpr.py
index ceb257e3dabfc..ce694c69ddca7 100644
--- a/lldb/test/API/types/TestFloatTypesExpr.py
+++ b/lldb/test/API/types/TestFloatTypesExpr.py
@@ -14,8 +14,6 @@
 
 class FloatTypesExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?

diff  --git a/lldb/test/API/types/TestIntegerType.py b/lldb/test/API/types/TestIntegerType.py
index 2b1fd8e84cf0f..c106175c28395 100644
--- a/lldb/test/API/types/TestIntegerType.py
+++ b/lldb/test/API/types/TestIntegerType.py
@@ -9,8 +9,6 @@
 
 class IntegerTypesTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_int_type(self):
         """Test that int-type variables are displayed correctly."""
         self.build_and_run('int.cpp', ['int'])

diff  --git a/lldb/test/API/types/TestIntegerTypeExpr.py b/lldb/test/API/types/TestIntegerTypeExpr.py
index 4dd8b43dbe4e2..ac55bd69c023a 100644
--- a/lldb/test/API/types/TestIntegerTypeExpr.py
+++ b/lldb/test/API/types/TestIntegerTypeExpr.py
@@ -9,8 +9,6 @@
 
 class IntegerTypeExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     @skipUnlessDarwin
     def test_unsigned_short_type_from_block(self):
         """Test that 'unsigned short'-type variables are displayed correctly from a block."""

diff  --git a/lldb/test/API/types/TestLongTypes.py b/lldb/test/API/types/TestLongTypes.py
index 74c4627a504a6..8df81684add71 100644
--- a/lldb/test/API/types/TestLongTypes.py
+++ b/lldb/test/API/types/TestLongTypes.py
@@ -9,8 +9,6 @@
 
 class LongTypesTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_long_type(self):
         """Test that long-type variables are displayed correctly."""
         self.build_and_run('long.cpp', ['long'])

diff  --git a/lldb/test/API/types/TestLongTypesExpr.py b/lldb/test/API/types/TestLongTypesExpr.py
index 9a33d36626daa..0c066914ea0db 100644
--- a/lldb/test/API/types/TestLongTypesExpr.py
+++ b/lldb/test/API/types/TestLongTypesExpr.py
@@ -9,8 +9,6 @@
 
 class LongTypesExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_long_type(self):
         """Test that long-type variable expressions are evaluated correctly."""
         self.build_and_run_expr('long.cpp', ['long'])

diff  --git a/lldb/test/API/types/TestRecursiveTypes.py b/lldb/test/API/types/TestRecursiveTypes.py
index 8deb193677a96..36900483e7166 100644
--- a/lldb/test/API/types/TestRecursiveTypes.py
+++ b/lldb/test/API/types/TestRecursiveTypes.py
@@ -11,8 +11,6 @@
 
 class RecursiveTypesTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

diff  --git a/lldb/test/API/types/TestShortType.py b/lldb/test/API/types/TestShortType.py
index e75827f2a7eac..548caa82de450 100644
--- a/lldb/test/API/types/TestShortType.py
+++ b/lldb/test/API/types/TestShortType.py
@@ -9,8 +9,6 @@
 
 class ShortTypeTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_short_type(self):
         """Test that short-type variables are displayed correctly."""
         self.build_and_run('short.cpp', ['short'])

diff  --git a/lldb/test/API/types/TestShortTypeExpr.py b/lldb/test/API/types/TestShortTypeExpr.py
index 96df238ed2256..3de0025286f66 100644
--- a/lldb/test/API/types/TestShortTypeExpr.py
+++ b/lldb/test/API/types/TestShortTypeExpr.py
@@ -9,8 +9,6 @@
 
 class ShortExprTestCase(AbstractBase.GenericTester):
 
-    mydir = AbstractBase.GenericTester.compute_mydir(__file__)
-
     def test_short_type(self):
         """Test that short-type variable expressions are evaluated correctly."""
         self.build_and_run_expr('short.cpp', ['short'])

diff  --git a/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py b/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py
index 5431abcdbca57..ab9c9f8c6c513 100644
--- a/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py
+++ b/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py
@@ -16,8 +16,6 @@
 
 class TestMPXTable(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
 


        


More information about the lldb-commits mailing list