Skip to content

Commit b270006

Browse files
authored
Merge pull request #10598 from felipepiovezan/felipe/disable_dap_flaky_tests
[cherry-pick][lldb] Disable flaky dap tests
2 parents 71469ce + 78bdeab commit b270006

File tree

13 files changed

+23
-10
lines changed

13 files changed

+23
-10
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,10 @@ def skipIf(
398398
)
399399

400400

401+
def skip(bugnumber=None):
402+
return _decorateTest(DecorateMode.Skip, bugnumber=bugnumber)
403+
404+
401405
def _skip_fn_for_android(reason, api_levels, archs):
402406
def impl():
403407
result = lldbplatformutil.match_android_device(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class TestCase(TestBase):
1313
# FIXME: This regressed in 69d5a6662115499198ebfa07a081e98a6ce4b915
1414
# but needs further investigation for what underlying Clang/LLDB bug can't
1515
# handle that code change.
16-
@skipIf
16+
@skip
1717
def test(self):
1818
self.build()
1919

lldb/test/API/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def setUp(self):
2828

2929
# Test hangs due to a kernel bug, see fdfeff0f in the linux kernel for details
3030
@skipIfTargetAndroid(api_levels=list(range(25 + 1)), archs=["aarch64", "arm"])
31-
@skipIf
31+
@skip
3232
def test_watched_var_should_only_hit_when_in_scope(self):
3333
"""Test that a variable watchpoint should only hit when in scope."""
3434
self.build(dictionary=self.d)

lldb/test/API/lang/objc/bitfield_ivars/TestBitfieldIvars.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test(self):
4242

4343
# This test is meant to be xfailed, but running the test triggers an ASan
4444
# issue, so it must be skipped for now.
45-
@skipIf
45+
@skip
4646
def testExprWholeObject(self):
4747
self.build()
4848
lldbutil.run_to_source_breakpoint(

lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def spawn_and_wait(program, delay):
2525
process.wait()
2626

2727

28+
@skipIf
2829
class TestDAP_attach(lldbdap_testcase.DAPTestCaseBase):
2930
def set_and_hit_breakpoint(self, continueToExit=True):
3031
source = "main.c"

lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import socket
2020

2121

22+
@skip
2223
class TestDAP_attachByPortNum(lldbdap_testcase.DAPTestCaseBase):
2324
default_timeout = 20
2425

lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_breakpointLocations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import lldbdap_testcase
1212
import os
1313

14-
14+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
15+
@skip
1516
class TestDAP_breakpointLocations(lldbdap_testcase.DAPTestCaseBase):
1617
def setUp(self):
1718
lldbdap_testcase.DAPTestCaseBase.setUp(self)

lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import lldbdap_testcase
1212
import os
1313

14-
14+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
15+
@skip
1516
class TestDAP_setBreakpoints(lldbdap_testcase.DAPTestCaseBase):
1617
def setUp(self):
1718
lldbdap_testcase.DAPTestCaseBase.setUp(self)

lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from lldbsuite.test import lldbtest, lldbutil
66
from lldbsuite.test.decorators import *
77

8-
8+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
9+
@skip
910
class TestDAP_commands(lldbdap_testcase.DAPTestCaseBase):
1011
def test_command_directive_quiet_on_success(self):
1112
program = self.getBuildArtifact("a.out")

lldb/test/API/tools/lldb-dap/disassemble/TestDAP_disassemble.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import lldbdap_testcase
1111
import os
1212

13-
13+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
14+
@skip
1415
class TestDAP_disassemble(lldbdap_testcase.DAPTestCaseBase):
1516
@skipIfWindows
1617
def test_disassemble(self):

lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from lldbsuite.test.decorators import *
1111
from lldbsuite.test.lldbtest import *
1212

13-
13+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
14+
@skip
1415
class TestDAP_evaluate(lldbdap_testcase.DAPTestCaseBase):
1516
def assertEvaluate(self, expression, regex):
1617
self.assertRegex(

lldb/test/API/tools/lldb-dap/memory/TestDAP_memory.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import lldbdap_testcase
1111
import os
1212

13-
13+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
14+
@skip
1415
class TestDAP_memory(lldbdap_testcase.DAPTestCaseBase):
1516
def test_memory_refs_variables(self):
1617
"""

lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ def make_buffer_verify_dict(start_idx, count, offset=0):
1717
verify_dict["[%i]" % (i)] = {"type": "int", "value": str(i + offset)}
1818
return verify_dict
1919

20-
20+
# DAP tests are flakey, see https://github.com/llvm/llvm-project/issues/137660.
21+
@skip
2122
class TestDAP_variables(lldbdap_testcase.DAPTestCaseBase):
2223
def verify_values(self, verify_dict, actual, varref_dict=None, expression=None):
2324
if "equals" in verify_dict:

0 commit comments

Comments
 (0)