Skip to content

Commit 70361a7

Browse files
authored
Merge pull request #11549 from augusto2112/revert-13c116b3
Revert "[lldb] Reenable TestEqualityOperators" & Revert "[lldb] look up function names in the swift language plugin
2 parents d10813b + 537e968 commit 70361a7

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lldb/source/Core/Module.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -661,11 +661,7 @@ Module::LookupInfo::LookupInfo(ConstString name,
661661
if (language != eLanguageTypeUnknown)
662662
lang_types.push_back(language);
663663
else
664-
lang_types = {eLanguageTypeObjC, eLanguageTypeC_plus_plus,
665-
#ifdef LLDB_ENABLE_SWIFT
666-
eLanguageTypeSwift
667-
#endif
668-
};
664+
lang_types = {eLanguageTypeObjC, eLanguageTypeC_plus_plus};
669665

670666
for (LanguageType lang_type : lang_types) {
671667
if (Language *lang = Language::FindPlugin(lang_type))

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
Tests that we can break on a partial name of a Swift function
1414
Effectively tests our chopper of Swift demangled names
1515
"""
16+
import lldb
1617
from lldbsuite.test.lldbtest import *
1718
from lldbsuite.test.decorators import *
1819
import lldbsuite.test.lldbutil as lldbutil
1920

21+
@skipIf(bugnumber = "rdar://159531198")
2022
class SwiftPartialBreakTest(TestBase):
2123
@swiftTest
2224
def test_swift_partial_break(self):

lldb/test/API/lang/swift/expression/equality_operators/TestEqualityOperators.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def execute_command(command):
3030
(exit_status, output) = subprocess.getstatusoutput(command)
3131
return exit_status
3232

33+
@skipIf(bugnumber = "rdar://159531216")
3334
class TestUnitTests(TestBase):
3435
@swiftTest
3536
@skipIf(debug_info=no_match(["dsym"]), bugnumber="This test is building a dSYM")

0 commit comments

Comments
 (0)