swiftlang · kastiglione · Jan 18, 2024 · Jan 17, 2024
diff --git a/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py b/lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py
@@ -21,9 +21,6 @@
 
 
 class TestSwiftErrorBreakpoint(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @decorators.skipIfLinux  # <rdar://problem/30909618>
     @swiftTest
     def test_swift_error_no_typename(self):

diff --git a/lldb/test/API/functionalities/data-formatter/swift-typealias/TestSwiftTypeAliasFormatters.py b/lldb/test/API/functionalities/data-formatter/swift-typealias/TestSwiftTypeAliasFormatters.py
@@ -20,9 +20,6 @@
 
 
 class TestSwiftTypeAliasFormatters(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_type_alias_formatters(self):
         """Test that Swift typealiases get formatted properly"""

diff --git a/lldb/test/API/functionalities/mtc/swift-property/TestMTCSwiftProperty.py b/lldb/test/API/functionalities/mtc/swift-property/TestMTCSwiftProperty.py
@@ -13,9 +13,6 @@
 
 
 class MTCSwiftPropertyTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(bugnumber="rdar://60396797",
                         setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/lldb/test/API/functionalities/mtc/swift/TestMTCSwift.py b/lldb/test/API/functionalities/mtc/swift/TestMTCSwift.py
@@ -13,9 +13,6 @@
 
 
 class MTCSwiftTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @expectedFailureAll(bugnumber="rdar://60396797",
                         setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/...functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py b/...functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py
@@ -9,9 +9,6 @@
 from lldbsuite.test.decorators import *
 
 class TestSwiftProgressReporting(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     def setUp(self):
         TestBase.setUp(self)
         self.broadcaster = self.dbg.GetBroadcaster()

diff --git a/lldb/test/API/lang/swift/any_object/TestSwiftAnyObjectType.py b/lldb/test/API/lang/swift/any_object/TestSwiftAnyObjectType.py
@@ -21,9 +21,6 @@
 
 
 class TestSwiftAnyObjectType(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_any_object_type(self):
         """Test the AnyObject type"""

diff --git a/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py b/lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py
@@ -21,9 +21,6 @@
 
 
 class TestSwiftArchetypeResolution(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_archetype_resolution(self):
         """Test that archetype-typed objects get resolved to their proper location in memory"""

diff --git a/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py b/lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py
@@ -21,9 +21,6 @@
 
 
 class TestSwiftArchetypeResolution(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_associated_type_resolution(self):
         """Test that archetype-typed objects get resolved to their proper location in memory"""

diff --git a/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py b/lldb/test/API/lang/swift/availability/TestSwiftAvailability.py
@@ -33,8 +33,6 @@ def getOlderVersion(major, minor):
 
 class TestAvailability(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff --git a/lldb/test/API/lang/swift/break_by_partial_name/TestSwiftBreakByPartialName.py b/lldb/test/API/lang/swift/break_by_partial_name/TestSwiftBreakByPartialName.py
@@ -21,9 +21,6 @@
 
 
 class SwiftPartialBreakTest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_partial_break(self):
         """Tests that we can break on a partial name of a Swift function"""

diff --git a/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py b/lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py
@@ -10,9 +10,6 @@
 
 
 class TestSwiftBridgedMetatype(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     @skipUnlessFoundation
     def test_swift_bridged_metatype(self):

diff --git a/lldb/test/API/lang/swift/bt_printing/TestSwiftBacktracePrinting.py b/lldb/test/API/lang/swift/bt_printing/TestSwiftBacktracePrinting.py
@@ -20,9 +20,6 @@
 
 
 class TestSwiftBacktracePrinting(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_backtrace_printing(self):
         """Test printing Swift backtrace"""

diff --git a/lldb/test/API/lang/swift/clangimporter/Werror/TestSwiftStripWerror.py b/lldb/test/API/lang/swift/clangimporter/Werror/TestSwiftStripWerror.py
@@ -5,7 +5,6 @@
 
 class TestSwiftWerror(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # Don't run ClangImporter tests if Clangimporter is disabled.

diff --git a/...PI/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py b/...PI/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py
@@ -20,7 +20,6 @@
 
 class TestSwiftBridgingHeaderHeadermap(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     # Don't run ClangImporter tests if Clangimporter is disabled.

diff --git a/lldb/test/API/lang/swift/clangimporter/clang_errorhandling/TestSwiftClangErrorHandling.py b/lldb/test/API/lang/swift/clangimporter/clang_errorhandling/TestSwiftClangErrorHandling.py
@@ -6,8 +6,6 @@
 
 class TestSwiftExtraClangFlags(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):

diff --git a/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py b/lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py
@@ -18,9 +18,6 @@
 import unittest2
 
 class TestSwiftDedupMacros(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/...r/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py b/...r/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftDynamicTypeResolutionImportConflict(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/lldb/test/API/lang/swift/clangimporter/expr_import/TestSwiftExprImport.py b/lldb/test/API/lang/swift/clangimporter/expr_import/TestSwiftExprImport.py
@@ -5,9 +5,6 @@
 import unittest2
 
 class TestSwiftExprImport(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/lldb/test/API/lang/swift/clangimporter/extra_clang_flags/TestSwiftExtraClangFlags.py b/lldb/test/API/lang/swift/clangimporter/extra_clang_flags/TestSwiftExtraClangFlags.py
@@ -5,9 +5,6 @@
 import unittest2
 
 class TestSwiftExtraClangFlags(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(oslist=['windows'])

diff --git a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftHeadermapConflict(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipIf(bugnumber="rdar://60396797",
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py b/lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftIncludeConflict(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py b/lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftMacroConflict(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py b/lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py
@@ -6,7 +6,6 @@
 import os
 
 class TestSwiftMissingVFSOverlay(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
 
     NO_DEBUG_INFO_TESTCASE = True
 

diff --git a/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/TestSwiftMissingVFSOverlay.py b/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/TestSwiftMissingVFSOverlay.py
@@ -6,8 +6,6 @@
 
 class TestSwiftMissingVFSOverlay(TestBase):
 
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     # Don't run ClangImporter tests if Clangimporter is disabled.

diff --git a/...ang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py b/...ang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftObjCMainConflictingDylibs(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/...n_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py b/...n_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftObjCMainConflictingDylibsBridgingHeader(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/...main_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py b/...main_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py
@@ -21,7 +21,6 @@
 class TestSwiftObjCMainConflictingDylibsFailingImport(TestBase):
 
     NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
 
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))

diff --git a/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/TestSwiftRemapSDKPath.py b/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/TestSwiftRemapSDKPath.py
@@ -6,9 +6,6 @@
 import unittest2
 
 class TestSwiftRewriteClangPaths(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     @swiftTest

diff --git a/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py b/lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py
@@ -18,9 +18,6 @@
 import unittest2
 
 class TestSwiftRemoteASTImport(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py
@@ -19,9 +19,6 @@
 import shutil
 
 class TestSwiftRewriteClangPaths(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

diff --git a/...test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py b/...test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py
@@ -18,9 +18,6 @@
 import unittest2
 
 class TestSwiftStaticArchiveTwoSwiftmodules(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     # Don't run ClangImporter tests if Clangimporter is disabled.
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

diff --git a/lldb/test/API/lang/swift/closures/TestSwiftClosures.py b/lldb/test/API/lang/swift/closures/TestSwiftClosures.py
@@ -15,9 +15,6 @@
 
 
 class TestPassedClosures(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(bugnumber="rdar://31816998")

diff --git a/lldb/test/API/lang/swift/completion/TestSwiftREPLCompletion.py b/lldb/test/API/lang/swift/completion/TestSwiftREPLCompletion.py
@@ -5,9 +5,6 @@
 from lldbsuite.test.lldbpexpect import PExpectTest
 
 class SwiftCompletionTest(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/swift/conditional_breakpoints/TestSwiftConditionalBreakpoint.py b/lldb/test/API/lang/swift/conditional_breakpoints/TestSwiftConditionalBreakpoint.py
@@ -20,9 +20,6 @@
 
 
 class TestSwiftConditionalBreakpoint(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_swift_conditional_breakpoint(self):
         """Tests that we can set a conditional breakpoint in Swift code"""

diff --git a/lldb/test/API/lang/swift/cross_module_extension/TestSwiftCrossModuleExtension.py b/lldb/test/API/lang/swift/cross_module_extension/TestSwiftCrossModuleExtension.py
@@ -21,9 +21,6 @@
 import unittest2
 
 class TestSwiftCrossModuleExtension(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @swiftTest
     def test_cross_module_extension(self):

diff --git a/lldb/test/API/lang/swift/debug_prefix_map/TestSwiftDebugPrefixMap.py b/lldb/test/API/lang/swift/debug_prefix_map/TestSwiftDebugPrefixMap.py
@@ -23,9 +23,6 @@
 
 
 class TestSwiftDebugPrefixMap(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_debug_prefix_map(self):
         self.do_test()

diff --git a/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py b/lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py
@@ -21,8 +21,6 @@
 
 
 class TestSwiftDeploymentTarget(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
     @skipUnlessDarwin

diff --git a/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py b/lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py
@@ -6,9 +6,6 @@
 
 
 class TestSwiftDeserializationFailure(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     def prepare(self):
         import shutil
         copied_source = self.getBuildArtifact("main.swift")

diff --git a/lldb/test/API/lang/swift/different_clang_flags/TestSwiftDifferentClangFlags.py b/lldb/test/API/lang/swift/different_clang_flags/TestSwiftDifferentClangFlags.py
@@ -36,9 +36,6 @@ def execute_command(command):
 
 
 class TestSwiftDifferentClangFlags(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @skipUnlessDarwin
     @swiftTest
     @skipIf(

diff --git a/lldb/test/API/lang/swift/dynamic_value/TestSwiftDynamicValue.py b/lldb/test/API/lang/swift/dynamic_value/TestSwiftDynamicValue.py
@@ -20,9 +20,6 @@
 
 
 class SwiftDynamicValueTest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_dynamic_value(self):
         """Tests that dynamic values work correctly for Swift"""

diff --git a/...test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py b/...test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py
@@ -14,9 +14,6 @@
 from lldbsuite.test.decorators import *
 
 class TestClassConstrainedProtocol(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
     @swiftTest
     def test_extension_weak_self(self):
         """Test that we can reconstruct weak self captured in a class constrained protocol."""