[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

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
+  command.
-  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.
 
   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

lldb/packages/Python/lldbsuite/test/lldbtest.py

@@ -4,10 +4,6 @@ LLDB module which provides the abstract base class of lldb test case.
 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 @@ class Base(unittest2.TestCase):
         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

lldb/test/API/android/platform/TestDefaultCacheLineSize.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 
 class DefaultCacheLineSizeTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessTargetAndroid

lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 
 class SBDirCheckerCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 
 class TestSBCommandReturnObject(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNoSBHeaders

lldb/test/API/api/listeners/TestListener.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 import six
 
 class ListenToModuleLoadedEvents (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_clearing_listener(self):

lldb/test/API/api/log/TestAPILog.py

@@ -11,8 +11,6 @@ from lldbsuite.test.lldbtest import *
 
 class APILogTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_api_log(self):

lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py

@@ -13,8 +13,6 @@ from lldbsuite.test import lldbutil
 
 class TestMultipleSimultaneousDebuggers(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfNoSBHeaders

lldb/test/API/api/multiple-targets/TestMultipleTargets.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 
 class TestMultipleTargets(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(oslist=["linux"], archs=["arm", "aarch64"])

lldb/test/API/api/multithreaded/TestMultithreaded.py

@@ -25,8 +25,6 @@ class SBBreakpointCallbackCase(TestBase):
         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)

lldb/test/API/arm/breakpoint-it/TestBreakpointIt.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 
 class TestBreakpointIt(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipIf(archs=no_match(["arm"]))

lldb/test/API/arm/breakpoint-thumb-codesection/TestBreakpointThumbCodesection.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 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

lldb/test/API/arm/emulation/TestEmulations.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 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")

lldb/test/API/assert_messages_test/TestAssertMessages.py

@@ -11,8 +11,6 @@ from textwrap import dedent
 
 
 class AssertMessagesTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def assert_expect_fails_with(self, cmd, expect_args, expected_msg):

lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class TestBenchmarkContinue(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark different ways to continue a process"""

lldb/test/API/benchmarks/expression/TestExpressionCmd.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class ExpressionEvaluationCase(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.source = 'main.cpp'

lldb/test/API/benchmarks/expression/TestRepeatedExprs.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class RepeatedExprsCase(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.source = 'main.cpp'

lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py

@@ -13,8 +13,6 @@ from lldbsuite.test.lldbbench import *
 
 class FrameVariableResponseBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class TestBenchmarkLibcxxList(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark the std::list data formatter (libc++)"""

lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class TestBenchmarkLibcxxMap(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @benchmarks_test
     def test_run_command(self):
         """Benchmark the std::map data formatter (libc++)"""

lldb/test/API/benchmarks/startup/TestStartupDelays.py

@@ -13,8 +13,6 @@ from lldbsuite.test.lldbbench import *
 
 class StartupDelaysBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         # Create self.stopwatch2 for measuring "set first breakpoint".

lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class SteppingSpeedBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class CompileRunToBreakpointBench(BenchBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         BenchBase.setUp(self)
         self.exe = lldbtest_config.lldbExec

lldb/test/API/commands/add-dsym/uuid/TestAddDsymCommand.py

@@ -13,8 +13,6 @@ from lldbsuite.test import lldbutil
 @skipUnlessDarwin
 class AddDsymCommandCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.template = 'main.cpp.template'

lldb/test/API/commands/apropos/basic/TestApropos.py

@@ -4,8 +4,6 @@ from lldbsuite.test.decorators import *
 
 class AproposTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_apropos(self):
         self.expect("apropos", error=True,

lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py

@@ -10,8 +10,6 @@ import lldbsuite.test.lldbutil as lldbutil
 
 
 class AproposWithProcessTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

lldb/test/API/commands/breakpoint/command/list/TestBreakpointCommandList.py

@@ -8,8 +8,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_list_commands(self):
         src_dir = self.getSourceDir()

lldb/test/API/commands/breakpoint/set/func-regex/TestBreakpointRegexError.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_error(self):
         self.expect("breakpoint set --func-regex (", error=True,

lldb/test/API/commands/command/container/TestContainerCommands.py

@@ -10,8 +10,6 @@ from lldbsuite.test.lldbtest import *
 
 
 class TestCmdContainer(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_container_add(self):

lldb/test/API/commands/command/delete/TestCommandDelete.py

@@ -4,8 +4,6 @@ from lldbsuite.test.decorators import *
 
 class DeleteCommandTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_delete_builtin(self):
         self.expect("command delete settings", error=True,

lldb/test/API/commands/command/invalid-args/TestInvalidArgsCommand.py

@@ -4,8 +4,6 @@ from lldbsuite.test.decorators import *
 
 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,

lldb/test/API/commands/command/nested_alias/TestNestedAlias.py

@@ -10,8 +10,6 @@ import lldbsuite.test.lldbutil as lldbutil
 
 
 class NestedAliasTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

lldb/test/API/commands/command/regex/TestRegexCommand.py

@@ -10,8 +10,6 @@ from lldbsuite.test.lldbtest import *
 
 class TestCommandRegexParsing(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_sample_rename_this(self):

lldb/test/API/commands/command/script/TestCommandScript.py

@@ -10,8 +10,6 @@ from lldbsuite.test.lldbtest import *
 
 
 class CmdPythonTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

lldb/test/API/commands/command/script/import/TestImport.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 class ImportTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @no_debug_info_test
     def test_import_command(self):

lldb/test/API/commands/command/script/import/rdar-12586188/TestRdar12586188.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 class Rdar12586188TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(['pyapi'])
     @no_debug_info_test
     def test_rdar12586188_command(self):

lldb/test/API/commands/command/script_alias/TestCommandScriptAlias.py

@@ -9,8 +9,6 @@ from lldbsuite.test.lldbtest import *
 
 
 class CommandScriptAliasTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_pycmd(self):

lldb/test/API/commands/command/source/TestCommandSource.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 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."""

lldb/test/API/commands/disassemble/basic/TestDisassembleBreakpoint.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 
 class DisassemblyTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):

lldb/test/API/commands/disassemble/basic/TestFrameDisassemble.py

@@ -11,8 +11,6 @@ from lldbsuite.test.lldbtest import *
 
 class FrameDisassembleTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_frame_disassemble(self):

lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py

@@ -13,7 +13,6 @@ from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 class TestExprLookupAnonStructTypedef(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=['linux'],

lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py

@@ -17,8 +17,6 @@ from lldbsuite.test import lldbutil
 
 class TestArgumentPassingRestrictions(TestBase):
 
-  mydir = TestBase.compute_mydir(__file__)
-
   @skipIf(compiler="clang", compiler_version=['<', '7.0'])
   def test_argument_passing_restrictions(self):
     self.build()

lldb/test/API/commands/expression/calculator_mode/TestCalculatorMode.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 
 class TestCalculatorMode(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def test__calculator_mode(self):

lldb/test/API/commands/expression/call-function/TestCallBuiltinFunction.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 class ExprCommandCallBuiltinFunction(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     # Builtins are expanded by Clang, so debug info shouldn't matter.
     NO_DEBUG_INFO_TESTCASE = True
 

lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class ExprCommandCallFunctionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         compiler="icc",
         bugnumber="llvm.org/pr14437, fails with ICC 13.1")

lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py

@@ -8,8 +8,6 @@ from lldbsuite.test import lldbutil
 
 class ExprCommandCallStopContinueTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class ExprCommandCallUserDefinedFunction(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test(self):
         """Test return values of user defined function calls."""
         self.build()

lldb/test/API/commands/expression/call-restarts/TestCallThatRestarts.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 
 class ExprCommandThatRestartsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

lldb/test/API/commands/expression/call-throws/TestCallThatThrows.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 class ExprCommandWithThrowTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 class TestCastIntToAnonymousEnum(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_cast_int_to_anonymous_enum(self):
         self.build()
 

lldb/test/API/commands/expression/char/TestExprsChar.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 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)

lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 class TestClassTemplateSpecializationParametersHandling(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_class_template_specialization(self):
         self.build()
 

lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 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"))

lldb/test/API/commands/expression/completion-crash-invalid-iterator/TestInvalidIteratorCompletionCrash.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf # rdar://problem/53931074
     def test(self):
         self.build()

lldb/test/API/commands/expression/completion/TestExprCompletion.py

@@ -11,8 +11,6 @@ from lldbsuite.test import lldbutil
 
 class CommandLineExprCompletionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_expr_completion(self):

lldb/test/API/commands/expression/context-object-objc/TestContextObjectObjc.py

@@ -9,8 +9,6 @@ from lldbsuite.test.lldbtest import *
 
 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."""

lldb/test/API/commands/expression/context-object/TestContextObject.py

@@ -8,8 +8,6 @@ from lldbsuite.test.lldbtest import *
 
 class ContextObjectTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_context_object(self):
         """Tests expression evaluation in context of an object."""
         self.build()

lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py

@@ -9,8 +9,6 @@ from lldbsuite.test.decorators import *
 
 class ExprDiagnosticsTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(oslist=["windows"])
     def test(self):
         self.build()

lldb/test/API/commands/expression/dont_allow_jit/TestAllowJIT.py

@@ -11,8 +11,6 @@ from lldbsuite.test.decorators import *
 
 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.

lldb/test/API/commands/expression/entry-bp/TestExprEntryBP.py

@@ -8,8 +8,6 @@ from lldbsuite.test.lldbtest import *
 
 class ExprEntryBPTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def test_expr_entry_bp(self):

lldb/test/API/commands/expression/error-limit/TestExprErrorLimit.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 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

lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py

@@ -8,8 +8,6 @@ from lldbsuite.test import lldbutil
 
 class ExprSyscallTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(
         oslist=["windows"],
         bugnumber="llvm.org/pr21765, getpid() does not exist on Windows")

lldb/test/API/commands/expression/fixits/TestFixIts.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 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."""
 

lldb/test/API/commands/expression/formatters/TestFormatters.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 class ExprFormattersTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 class TestFunctionTemplateSpecializationTempArgs(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     def test_function_template_specialization_temp_args(self):
         self.build()
 

lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/basic/TestImportStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class ImportStdModule(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py

@@ -14,8 +14,6 @@ from lldbsuite.test import lldbutil
 
 class TestImportStdModuleConflicts(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestBasicDeque(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestDbgInfoContentDeque(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py

@@ -10,8 +10,6 @@ import os
 
 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.

lldb/test/API/commands/expression/import-std-module/forward_decl_from_module/TestForwardDeclFromStdModule.py

@@ -10,8 +10,6 @@ import os
 
 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.

lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestDbgInfoContentForwardList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestBasicForwardList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/iterator/TestIteratorFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 class TestDbgInfoContentList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestBasicList(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/missing-module-sources/TestStdModuleSourcesMissing.py

@@ -11,8 +11,6 @@ import shutil
 
 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.

lldb/test/API/commands/expression/import-std-module/module-build-errors/TestStdModuleBuildErrors.py

@@ -14,8 +14,6 @@ import os
 
 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.

lldb/test/API/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py

@@ -15,8 +15,6 @@ from lldbsuite.test import lldbutil
 
 class STLTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/pair/TestPairFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     # FIXME: This regressed in 69d5a6662115499198ebfa07a081e98a6ce4b915

lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestQueue(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py

@@ -5,8 +5,6 @@ from lldbsuite.test import lldbutil
 
 class TestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestSharedPtrDbgInfoContent(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestSharedPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/stack/TestStackFromStdModule.py

@@ -8,8 +8,6 @@ from lldbsuite.test import lldbutil
 
 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.

lldb/test/API/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py

@@ -10,8 +10,6 @@ import os
 
 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.

lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestUniquePtrDbgInfoContent(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler="clang", compiler_version=['<', '9.0'])

lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestUniquePtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler="clang", compiler_version=['<', '9.0'])

lldb/test/API/commands/expression/import-std-module/vector-bool/TestVectorBoolFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestBoolVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py

@@ -10,8 +10,6 @@ from lldbsuite.test import lldbutil
 
 class TestDbgInfoContentVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestVectorOfVectors(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestBasicVector(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestDbgInfoContentWeakPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py

@@ -9,8 +9,6 @@ from lldbsuite.test import lldbutil
 
 class TestSharedPtr(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
     def test(self):

lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py

@@ -12,8 +12,6 @@ from lldbsuite.test import lldbutil
 
 class TestImportBuiltinFileID(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIfDarwinEmbedded
     @add_test_categories(["gmodules", "objc"])
     def test_import_builtin_fileid(self):

lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py

@@ -10,7 +10,6 @@ from lldbsuite.test import lldbutil
 
 
 class TestInlineNamespace(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     def test(self):
         self.build()

lldb/test/API/commands/expression/invalid-args/TestInvalidArgsExpression.py

@@ -4,8 +4,6 @@ from lldbsuite.test.decorators import *
 
 class InvalidArgsExpressionTestCase(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     @no_debug_info_test
     def test_invalid_lang(self):
         self.expect("expression -l foo --", error=True,