Skip to content

Commit

Permalink
Merge pull request swiftlang#8269 from apple/lldb/type-completion-rew…
Browse files Browse the repository at this point in the history
…ork/WIP/more-xfails-to-20230725

[lldb][test] XFAIL/skip more tests when plugin.typesystem.clang.experimental-redecl-completion is enabled
  • Loading branch information
Michael137 committed Feb 24, 2024
2 parents f5bf0e4 + 68f6f2f commit 0257505
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class TestDbgInfoContentList(TestBase):
@skipIf(compiler=no_match("clang"))
@skipIf(compiler="clang", compiler_version=["<", "12.0"])
@skipIf(macos_version=["<", "14.0"])
@skipIf(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
def test(self):
self.build()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class TestDbgInfoContentVector(TestBase):
@skipIf(compiler=no_match("clang"))
@skipIf(compiler="clang", compiler_version=["<", "12.0"])
@skipIf(macos_version=["<", "14.0"])
@skipIf(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
def test(self):
self.build()

Expand Down
2 changes: 2 additions & 0 deletions lldb/test/API/functionalities/lazy-loading/TestLazyLoading.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def test_printing_local_variable_in_other_struct_func(self):
self.assert_decl_not_loaded(self.some_struct_decl)
self.assert_decl_not_loaded(self.class_in_namespace_decl)

@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
@add_test_categories(["dwarf"])
def test_printing_struct_with_multiple_locals(self):
"""
Expand All @@ -196,6 +197,7 @@ def test_printing_struct_with_multiple_locals(self):
self.assert_decl_not_completed(self.other_struct_decl)
self.assert_decl_not_completed(self.class_in_namespace_decl)

@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
@add_test_categories(["dwarf"])
def test_addr_of_struct(self):
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def setUp(self):
self.listener = lldbutil.start_listening_from(self.broadcaster,
lldb.SBDebugger.eBroadcastBitProgress)

@skipIf(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
# Don't run ClangImporter tests if Clangimporter is disabled.
@skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
@skipUnlessDarwin
Expand Down
1 change: 1 addition & 0 deletions lldb/test/API/lang/c/shared_lib/TestSharedLib.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def test_expr(self):
"""Test that types work when defined in a shared library and forward-declared in the main executable"""
self.common_test_expr(True)

@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
def test_expr_no_preload(self):
"""Test that types work when defined in a shared library and forward-declared in the main executable, but with preloading disabled"""
self.common_test_expr(False)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@


class TestCase(TestBase):
@expectedFailure("The fix for this was reverted due to llvm.org/PR52257")
#@expectedFailureAll(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'false'))
@skipIf("Currently the above XFAIL doesn't check the LLDB setting. Skip until 'setting' parameter is fixed")
def test(self):
self.build()
self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

class TestSwiftForwardInteropSTLTypes(TestBase):

@skipIf(setting=('plugin.typesystem.clang.experimental-redecl-completion', 'true'))
@skipIfLinux # rdar://106532498
@skipIf(setting=('symbols.use-swift-clangimporter', 'false')) # rdar://106438227 (TestSTLTypes fails when clang importer is disabled)
@swiftTest
Expand Down

0 comments on commit 0257505

Please sign in to comment.