Skip to content

Commit 45a3fd2

Browse files
bulbazordbulbazord
committed
[lldb][test_suite] Update tests with unexpected pass on Android aarch64
Summary: update some test decorates that can actually pass on andriod aarch64 Patch by Wanyi Ye <kusmour@gmail.com> Differential Revision: https://reviews.llvm.org/D64767 llvm-svn: 366858
1 parent 511f7f5 commit 45a3fd2

File tree

14 files changed

+37
-18
lines changed

14 files changed

+37
-18
lines changed

‎lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@ class HardwareBreakpointMultiThreadTestCase(TestBase):
2222

2323
# LLDB supports hardware breakpoints for arm and aarch64 architectures.
2424
@skipIf(archs=no_match(['arm', 'aarch64']))
25-
@expectedFailureAndroid
2625
def test_hw_break_set_delete_multi_thread(self):
2726
self.build()
2827
self.setTearDownCleanup()
2928
self.break_multi_thread('delete')
3029

3130
# LLDB supports hardware breakpoints for arm and aarch64 architectures.
3231
@skipIf(archs=no_match(['arm', 'aarch64']))
33-
@expectedFailureAndroid
3432
def test_hw_break_set_disable_multi_thread(self):
3533
self.build()
3634
self.setTearDownCleanup()

‎lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class TestDeletedExecutable(TestBase):
1818
NO_DEBUG_INFO_TESTCASE = True
1919

2020
@skipIfWindows # cannot delete a running executable
21-
@expectedFailureAll(oslist=["linux"]) # determining the architecture of the process fails
21+
@expectedFailureAll(oslist=["linux"],
22+
triple=no_match('aarch64-.*-android'))
23+
# determining the architecture of the process fails
2224
@expectedFailureNetBSD
2325
def test(self):
2426
self.build()

‎lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def test_inferior_asserting_register(self):
5151
archs=[
5252
"aarch64",
5353
"arm"],
54+
triple=no_match(".*-android"),
5455
bugnumber="llvm.org/pr25338")
5556
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
5657
@expectedFailureNetBSD
@@ -76,6 +77,7 @@ def test_inferior_asserting_python(self):
7677
archs=[
7778
"aarch64",
7879
"arm"],
80+
triple=no_match(".*-android"),
7981
bugnumber="llvm.org/pr25338")
8082
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
8183
@expectedFailureNetBSD
@@ -92,6 +94,7 @@ def test_inferior_asserting_expr(self):
9294
archs=[
9395
"aarch64",
9496
"arm"],
97+
triple=no_match(".*-android"),
9598
bugnumber="llvm.org/pr25338")
9699
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
97100
@expectedFailureNetBSD

‎lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def test_step_over_load(self):
363363

364364
# We can't find a breakpoint location for d_init before launching because
365365
# executable dependencies are resolved relative to the debuggers PWD. Bug?
366-
@expectedFailureAll(oslist=["linux"])
366+
@expectedFailureAll(oslist=["linux"], triple=no_match('aarch64-.*-android'))
367367
@skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
368368
@skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
369369
@expectedFailureNetBSD

‎lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ def test_target_command(self):
3939

4040
self.do_target_command()
4141

42-
# rdar://problem/9763907
43-
# 'target variable' command fails if the target program has been run
44-
@expectedFailureAndroid(archs=['aarch64'])
4542
def test_target_variable_command(self):
4643
"""Test 'target variable' command before and after starting the inferior."""
4744
d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}
@@ -50,7 +47,6 @@ def test_target_variable_command(self):
5047

5148
self.do_target_variable_command('globals')
5249

53-
@expectedFailureAndroid(archs=['aarch64'])
5450
def test_target_variable_command_no_fail(self):
5551
"""Test 'target variable' command before and after starting the inferior."""
5652
d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}

‎lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,20 @@ def has_exactly_one_image(self, matching, msg=""):
3030
self.expect(
3131
"image list", msg, matching=should_match, substrs=['[ 1]'])
3232

33-
@expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
33+
34+
@expectedFailureAll(oslist=["linux"],
35+
triple=no_match(".*-android"))
36+
#linux does not support loading dependent files, but android does
3437
@expectedFailureNetBSD
3538
def test_dependents_implicit_default_exe(self):
3639
"""Test default behavior"""
3740
exe = self.getBuildArtifact("a.out")
3841
self.runCmd("target create " + exe, CURRENT_EXECUTABLE_SET)
3942
self.has_exactly_one_image(False)
4043

41-
@expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
44+
@expectedFailureAll(oslist=["linux"],
45+
triple=no_match(".*-android"))
46+
#linux does not support loading dependent files, but android does
4247
@expectedFailureNetBSD
4348
def test_dependents_explicit_default_exe(self):
4449
"""Test default behavior"""
@@ -52,7 +57,9 @@ def test_dependents_explicit_true_exe(self):
5257
self.runCmd("target create -dtrue " + exe, CURRENT_EXECUTABLE_SET)
5358
self.has_exactly_one_image(True)
5459

55-
@expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
60+
@expectedFailureAll(oslist=["linux"],
61+
triple=no_match(".*-android"))
62+
#linux does not support loading dependent files, but android does
5663
@expectedFailureNetBSD
5764
def test_dependents_explicit_false_exe(self):
5865
"""Test default behavior"""
@@ -66,6 +73,7 @@ def test_dependents_implicit_false_exe(self):
6673
self.runCmd("target create -d " + exe, CURRENT_EXECUTABLE_SET)
6774
self.has_exactly_one_image(True)
6875

76+
@expectedFailureAndroid # android will return mutiple images
6977
def test_dependents_implicit_default_lib(self):
7078
ctx = self.platformContext
7179
dylibName = ctx.shlib_prefix + 'load_a.' + ctx.shlib_extension
@@ -87,7 +95,9 @@ def test_dependents_explicit_true_lib(self):
8795
self.runCmd("target create -dtrue " + lib, CURRENT_EXECUTABLE_SET)
8896
self.has_exactly_one_image(True)
8997

90-
@expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
98+
@expectedFailureAll(oslist=["linux"],
99+
triple=no_match(".*-android"))
100+
#linux does not support loading dependent files, but android does
91101
@expectedFailureNetBSD
92102
def test_dependents_explicit_false_lib(self):
93103
ctx = self.platformContext

‎lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ def setUp(self):
3636
@expectedFailureAll(
3737
oslist=["linux"],
3838
archs=["aarch64"],
39-
bugnumber="llvm.org/pr27710")
39+
triple=no_match(".*-android"),
40+
bugnumber="llvm.org/pr27710") # work on android
4041
@expectedFailureAll(
4142
oslist=["windows"],
4243
bugnumber="llvm.org/pr24446: WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows")
@@ -105,7 +106,8 @@ def test_watchpoint_command(self):
105106
@expectedFailureAll(
106107
oslist=["linux"],
107108
archs=["aarch64"],
108-
bugnumber="llvm.org/pr27710")
109+
triple=no_match(".*-android"),
110+
bugnumber="llvm.org/pr27710") # work on android
109111
@expectedFailureAll(
110112
oslist=["windows"],
111113
bugnumber="llvm.org/pr24446: WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows")

‎lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ def setUp(self):
4040
@expectedFailureAll(
4141
oslist=["linux"],
4242
archs=["aarch64"],
43-
bugnumber="llvm.org/pr27710")
43+
triple=no_match(".*-android"),
44+
bugnumber="llvm.org/pr27710") # work on android
4445
@expectedFailureNetBSD
4546
def test_watchpoint_command(self):
4647
"""Test 'watchpoint command'."""
@@ -111,7 +112,8 @@ def test_watchpoint_command(self):
111112
@expectedFailureAll(
112113
oslist=["linux"],
113114
archs=["aarch64"],
114-
bugnumber="llvm.org/pr27710")
115+
triple=no_match(".*-android"),
116+
bugnumber="llvm.org/pr27710") # work on android
115117
@expectedFailureNetBSD
116118
def test_continue_in_watchpoint_command(self):
117119
"""Test continue in a watchpoint command."""

‎lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def setUp(self):
3636
@expectedFailureAll(
3737
oslist=["linux"],
3838
archs=["aarch64"],
39+
triple=no_match(".*-android"),
3940
bugnumber="llvm.org/pr27710")
4041
@expectedFailureAll(
4142
oslist=["windows"],

‎lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def setUp(self):
2525
@expectedFailureAll(
2626
oslist=["linux"],
2727
archs=["aarch64"],
28+
triple=no_match(".*-android"),
2829
bugnumber="llvm.org/pr27710")
2930
@expectedFailureAll(
3031
oslist=["windows"],

0 commit comments

Comments
 (0)