Skip to content

Commit b6ab783

Browse files
authored
[lldb][test] Remove unnecessary mydir assignments (NFC) (#7989)
The default location of `mydir` is determined in `lldbtest.py`. Tests only need to define it if they need a custom location. Each of these `TestBase.compute_mydir(__file__)` definitions is redundant. This PR changes Swift specific tests.
1 parent efd5925 commit b6ab783

File tree

144 files changed

+0
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+0
-404
lines changed

lldb/test/API/functionalities/breakpoint/swift_exception/TestExpressionErrorBreakpoint.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222

2323
class TestSwiftErrorBreakpoint(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@decorators.skipIfLinux # <rdar://problem/30909618>
2825
@swiftTest
2926
def test_swift_error_no_typename(self):

lldb/test/API/functionalities/data-formatter/swift-typealias/TestSwiftTypeAliasFormatters.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121

2222
class TestSwiftTypeAliasFormatters(TestBase):
23-
24-
mydir = TestBase.compute_mydir(__file__)
25-
2623
@swiftTest
2724
def test_swift_type_alias_formatters(self):
2825
"""Test that Swift typealiases get formatted properly"""

lldb/test/API/functionalities/mtc/swift-property/TestMTCSwiftProperty.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414

1515
class MTCSwiftPropertyTestCase(TestBase):
16-
17-
mydir = TestBase.compute_mydir(__file__)
18-
1916
@expectedFailureAll(bugnumber="rdar://60396797",
2017
setting=('symbols.use-swift-clangimporter', 'false'))
2118
@skipUnlessDarwin

lldb/test/API/functionalities/mtc/swift/TestMTCSwift.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414

1515
class MTCSwiftTestCase(TestBase):
16-
17-
mydir = TestBase.compute_mydir(__file__)
18-
1916
@expectedFailureAll(bugnumber="rdar://60396797",
2017
setting=('symbols.use-swift-clangimporter', 'false'))
2118
@skipUnlessDarwin

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
from lldbsuite.test.decorators import *
1010

1111
class TestSwiftProgressReporting(TestBase):
12-
13-
mydir = TestBase.compute_mydir(__file__)
14-
1512
def setUp(self):
1613
TestBase.setUp(self)
1714
self.broadcaster = self.dbg.GetBroadcaster()

lldb/test/API/lang/swift/any_object/TestSwiftAnyObjectType.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222

2323
class TestSwiftAnyObjectType(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@swiftTest
2825
def test_any_object_type(self):
2926
"""Test the AnyObject type"""

lldb/test/API/lang/swift/archetype_resolution/TestSwiftArchetypeResolution.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222

2323
class TestSwiftArchetypeResolution(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@swiftTest
2825
def test_swift_archetype_resolution(self):
2926
"""Test that archetype-typed objects get resolved to their proper location in memory"""

lldb/test/API/lang/swift/associated_type_resolution/TestSwiftAssociatedTypeResolution.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222

2323
class TestSwiftArchetypeResolution(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@swiftTest
2825
def test_swift_associated_type_resolution(self):
2926
"""Test that archetype-typed objects get resolved to their proper location in memory"""

lldb/test/API/lang/swift/availability/TestSwiftAvailability.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ def getOlderVersion(major, minor):
3333

3434
class TestAvailability(TestBase):
3535

36-
mydir = TestBase.compute_mydir(__file__)
37-
3836
NO_DEBUG_INFO_TESTCASE = True
3937

4038
def setUp(self):

lldb/test/API/lang/swift/break_by_partial_name/TestSwiftBreakByPartialName.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222

2323
class SwiftPartialBreakTest(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@swiftTest
2825
def test_swift_partial_break(self):
2926
"""Tests that we can break on a partial name of a Swift function"""

lldb/test/API/lang/swift/bridged_metatype/TestSwiftBridgedMetatype.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111

1212
class TestSwiftBridgedMetatype(TestBase):
13-
14-
mydir = TestBase.compute_mydir(__file__)
15-
1613
@swiftTest
1714
@skipUnlessFoundation
1815
def test_swift_bridged_metatype(self):

lldb/test/API/lang/swift/bt_printing/TestSwiftBacktracePrinting.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121

2222
class TestSwiftBacktracePrinting(TestBase):
23-
24-
mydir = TestBase.compute_mydir(__file__)
25-
2623
@swiftTest
2724
def test_swift_backtrace_printing(self):
2825
"""Test printing Swift backtrace"""

lldb/test/API/lang/swift/clangimporter/Werror/TestSwiftStripWerror.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
class TestSwiftWerror(TestBase):
77

8-
mydir = TestBase.compute_mydir(__file__)
98
NO_DEBUG_INFO_TESTCASE = True
109

1110
# Don't run ClangImporter tests if Clangimporter is disabled.

lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/TestSwiftBridgingHeaderHeadermap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
class TestSwiftBridgingHeaderHeadermap(TestBase):
2222

23-
mydir = TestBase.compute_mydir(__file__)
2423
NO_DEBUG_INFO_TESTCASE = True
2524

2625
# Don't run ClangImporter tests if Clangimporter is disabled.

lldb/test/API/lang/swift/clangimporter/clang_errorhandling/TestSwiftClangErrorHandling.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
class TestSwiftExtraClangFlags(TestBase):
88

9-
mydir = TestBase.compute_mydir(__file__)
10-
119
NO_DEBUG_INFO_TESTCASE = True
1210

1311
def setUp(self):

lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import unittest2
1919

2020
class TestSwiftDedupMacros(TestBase):
21-
22-
mydir = TestBase.compute_mydir(__file__)
23-
2421
# Don't run ClangImporter tests if Clangimporter is disabled.
2522
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2623
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftDynamicTypeResolutionImportConflict(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipUnlessDarwin

lldb/test/API/lang/swift/clangimporter/expr_import/TestSwiftExprImport.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import unittest2
66

77
class TestSwiftExprImport(TestBase):
8-
9-
mydir = TestBase.compute_mydir(__file__)
10-
118
# Don't run ClangImporter tests if Clangimporter is disabled.
129
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
1310
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/extra_clang_flags/TestSwiftExtraClangFlags.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import unittest2
66

77
class TestSwiftExtraClangFlags(TestBase):
8-
9-
mydir = TestBase.compute_mydir(__file__)
10-
118
# Don't run ClangImporter tests if Clangimporter is disabled.
129
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
1310
@skipIf(oslist=['windows'])

lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftHeadermapConflict(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
@skipIf(bugnumber="rdar://60396797",
2623
setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/include_conflict/TestSwiftIncludeConflict.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftIncludeConflict(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/macro_conflict/TestSwiftMacroConflict.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftMacroConflict(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/missing_pch/TestSwiftMissingPCH.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import os
77

88
class TestSwiftMissingVFSOverlay(TestBase):
9-
mydir = TestBase.compute_mydir(__file__)
109

1110
NO_DEBUG_INFO_TESTCASE = True
1211

lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/TestSwiftMissingVFSOverlay.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
class TestSwiftMissingVFSOverlay(TestBase):
88

9-
mydir = TestBase.compute_mydir(__file__)
10-
119
NO_DEBUG_INFO_TESTCASE = True
1210

1311
# Don't run ClangImporter tests if Clangimporter is disabled.

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/TestSwiftObjCMainConflictingDylibs.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftObjCMainConflictingDylibs(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipUnlessDarwin

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/TestSwiftObjCMainConflictingDylibsBridgingHeader.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftObjCMainConflictingDylibsBridgingHeader(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipUnlessDarwin

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/TestSwiftObjCMainConflictingDylibsFailingImport.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
class TestSwiftObjCMainConflictingDylibsFailingImport(TestBase):
2222

2323
NO_DEBUG_INFO_TESTCASE = True
24-
mydir = TestBase.compute_mydir(__file__)
2524

2625
# Don't run ClangImporter tests if Clangimporter is disabled.
2726
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))

lldb/test/API/lang/swift/clangimporter/remap_sdk_path/TestSwiftRemapSDKPath.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import unittest2
77

88
class TestSwiftRewriteClangPaths(TestBase):
9-
10-
mydir = TestBase.compute_mydir(__file__)
11-
129
@skipUnlessDarwin
1310
@skipIfDarwinEmbedded
1411
@swiftTest

lldb/test/API/lang/swift/clangimporter/remoteast_import/TestSwiftRemoteASTImport.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import unittest2
1919

2020
class TestSwiftRemoteASTImport(TestBase):
21-
22-
mydir = TestBase.compute_mydir(__file__)
23-
2421
# Don't run ClangImporter tests if Clangimporter is disabled.
2522
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2623
@skipUnlessDarwin

lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/TestSwiftRewriteClangPaths.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import shutil
2020

2121
class TestSwiftRewriteClangPaths(TestBase):
22-
23-
mydir = TestBase.compute_mydir(__file__)
24-
2522
# Don't run ClangImporter tests if Clangimporter is disabled.
2623
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2724
@skipIf(setting=('symbols.swift-precise-compiler-invocation', 'true'))

lldb/test/API/lang/swift/clangimporter/static_archive/TestSwiftStaticArchiveTwoSwiftmodules.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import unittest2
1919

2020
class TestSwiftStaticArchiveTwoSwiftmodules(TestBase):
21-
22-
mydir = TestBase.compute_mydir(__file__)
23-
2421
# Don't run ClangImporter tests if Clangimporter is disabled.
2522
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
2623
@skipUnlessDarwin

lldb/test/API/lang/swift/closures/TestSwiftClosures.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616

1717
class TestPassedClosures(TestBase):
18-
19-
mydir = TestBase.compute_mydir(__file__)
20-
2118
NO_DEBUG_INFO_TESTCASE = True
2219

2320
@expectedFailureAll(bugnumber="rdar://31816998")

lldb/test/API/lang/swift/completion/TestSwiftREPLCompletion.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
from lldbsuite.test.lldbpexpect import PExpectTest
66

77
class SwiftCompletionTest(PExpectTest):
8-
9-
mydir = TestBase.compute_mydir(__file__)
10-
118
# PExpect uses many timeouts internally and doesn't play well
129
# under ASAN on a loaded machine..
1310
@skipIfAsan

lldb/test/API/lang/swift/conditional_breakpoints/TestSwiftConditionalBreakpoint.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121

2222
class TestSwiftConditionalBreakpoint(TestBase):
23-
24-
mydir = TestBase.compute_mydir(__file__)
25-
2623
@swiftTest
2724
def test_swift_conditional_breakpoint(self):
2825
"""Tests that we can set a conditional breakpoint in Swift code"""

lldb/test/API/lang/swift/cross_module_extension/TestSwiftCrossModuleExtension.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import unittest2
2222

2323
class TestSwiftCrossModuleExtension(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
26-
2724
@skipUnlessDarwin
2825
@swiftTest
2926
def test_cross_module_extension(self):

lldb/test/API/lang/swift/debug_prefix_map/TestSwiftDebugPrefixMap.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323

2424

2525
class TestSwiftDebugPrefixMap(TestBase):
26-
27-
mydir = TestBase.compute_mydir(__file__)
28-
2926
@swiftTest
3027
def test_debug_prefix_map(self):
3128
self.do_test()

lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222

2323
class TestSwiftDeploymentTarget(TestBase):
24-
25-
mydir = TestBase.compute_mydir(__file__)
2624
NO_DEBUG_INFO_TESTCASE = True
2725

2826
@skipUnlessDarwin

lldb/test/API/lang/swift/deserialization_failure/TestSwiftDeserializationFailure.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77

88
class TestSwiftDeserializationFailure(TestBase):
9-
10-
mydir = TestBase.compute_mydir(__file__)
11-
129
def prepare(self):
1310
import shutil
1411
copied_source = self.getBuildArtifact("main.swift")

lldb/test/API/lang/swift/different_clang_flags/TestSwiftDifferentClangFlags.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ def execute_command(command):
3636

3737

3838
class TestSwiftDifferentClangFlags(TestBase):
39-
40-
mydir = TestBase.compute_mydir(__file__)
41-
4239
@skipUnlessDarwin
4340
@swiftTest
4441
@skipIf(

lldb/test/API/lang/swift/dynamic_value/TestSwiftDynamicValue.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121

2222
class SwiftDynamicValueTest(TestBase):
23-
24-
mydir = TestBase.compute_mydir(__file__)
25-
2623
@swiftTest
2724
def test_dynamic_value(self):
2825
"""Tests that dynamic values work correctly for Swift"""

lldb/test/API/lang/swift/expression/class_constrained_protocol/TestClassConstrainedProtocol.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
from lldbsuite.test.decorators import *
1515

1616
class TestClassConstrainedProtocol(TestBase):
17-
18-
mydir = TestBase.compute_mydir(__file__)
19-
2017
@swiftTest
2118
def test_extension_weak_self(self):
2219
"""Test that we can reconstruct weak self captured in a class constrained protocol."""

0 commit comments

Comments
 (0)