kusmour created this revision.
kusmour added reviewers: xiaobai, labath.
Herald added subscribers: lldb-commits, kristof.beyls, javed.absar, srhines.
Herald added a project: LLDB.
update some test decorates that can actually pass on andriod aarch64
Repository:
rLLDB LLDB
https://reviews.llvm.org/D64767
Files:
lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py
lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py
lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
@@ -1279,7 +1279,6 @@
@llgs_test
@skipUnlessPlatform(oslist=['linux'])
- @expectedFailureAndroid
@skipIf(archs=no_match(['arm', 'aarch64']))
def test_hardware_breakpoint_set_and_remove_work_llgs(self):
self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -36,6 +36,7 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr27710")
@skipIfWindows # Watchpoints not supported on Windows, and this test hangs
def test_watchpoint_cond_api(self):
Index: lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
+++ lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
@@ -22,7 +22,10 @@
self.shlib_names = ["a"]
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
- @expectedFailureAll(oslist=["linux"], archs=["aarch64"], bugnumber="llvm.org/pr37301")
+ @expectedFailureAll(oslist=["linux"],
+ archs=["aarch64"],
+ triple=no_match(".*-android"),
+ bugnumber="llvm.org/pr37301")
def test_without_process(self):
"""Test that static initialized variables can be inspected without
process."""
Index: lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
+++ lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
@@ -31,6 +31,7 @@
archs=[
'arm',
'aarch64'],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr27883")
@expectedFailureAll(
oslist=["windows"],
Index: lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
@@ -25,6 +25,7 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr27710")
@expectedFailureAll(
oslist=["windows"],
Index: lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -36,6 +36,7 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr27710")
@expectedFailureAll(
oslist=["windows"],
Index: lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -40,7 +40,8 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
- bugnumber="llvm.org/pr27710")
+ triple=no_match(".*-android"),
+ bugnumber="llvm.org/pr27710") # work on android
@expectedFailureNetBSD
def test_watchpoint_command(self):
"""Test 'watchpoint command'."""
@@ -111,7 +112,8 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
- bugnumber="llvm.org/pr27710")
+ triple=no_match(".*-android"),
+ bugnumber="llvm.org/pr27710") # work on android
@expectedFailureNetBSD
def test_continue_in_watchpoint_command(self):
"""Test continue in a watchpoint command."""
Index: lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -36,7 +36,8 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
- bugnumber="llvm.org/pr27710")
+ triple=no_match(".*-android"),
+ bugnumber="llvm.org/pr27710") # work on android
@expectedFailureAll(
oslist=["windows"],
bugnumber="llvm.org/pr24446: WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows")
@@ -105,7 +106,8 @@
@expectedFailureAll(
oslist=["linux"],
archs=["aarch64"],
- bugnumber="llvm.org/pr27710")
+ triple=no_match(".*-android"),
+ bugnumber="llvm.org/pr27710") # work on android
@expectedFailureAll(
oslist=["windows"],
bugnumber="llvm.org/pr24446: WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows")
Index: lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py
@@ -30,7 +30,10 @@
self.expect(
"image list", msg, matching=should_match, substrs=['[ 1]'])
- @expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
+
+ @expectedFailureAll(oslist=["linux"],
+ triple=no_match(".*-android"))
+ #linux does not support loading dependent files, but android does
@expectedFailureNetBSD
def test_dependents_implicit_default_exe(self):
"""Test default behavior"""
@@ -38,7 +41,9 @@
self.runCmd("target create " + exe, CURRENT_EXECUTABLE_SET)
self.has_exactly_one_image(False)
- @expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
+ @expectedFailureAll(oslist=["linux"],
+ triple=no_match(".*-android"))
+ #linux does not support loading dependent files, but android does
@expectedFailureNetBSD
def test_dependents_explicit_default_exe(self):
"""Test default behavior"""
@@ -52,7 +57,9 @@
self.runCmd("target create -dtrue " + exe, CURRENT_EXECUTABLE_SET)
self.has_exactly_one_image(True)
- @expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
+ @expectedFailureAll(oslist=["linux"],
+ triple=no_match(".*-android"))
+ #linux does not support loading dependent files, but android does
@expectedFailureNetBSD
def test_dependents_explicit_false_exe(self):
"""Test default behavior"""
@@ -66,6 +73,7 @@
self.runCmd("target create -d " + exe, CURRENT_EXECUTABLE_SET)
self.has_exactly_one_image(True)
+ @expectedFailureAndroid # android will return mutiple images
def test_dependents_implicit_default_lib(self):
ctx = self.platformContext
dylibName = ctx.shlib_prefix + 'load_a.' + ctx.shlib_extension
@@ -87,7 +95,9 @@
self.runCmd("target create -dtrue " + lib, CURRENT_EXECUTABLE_SET)
self.has_exactly_one_image(True)
- @expectedFailureAll(oslist=["linux"]) #linux does not support loading dependent files
+ @expectedFailureAll(oslist=["linux"],
+ triple=no_match(".*-android"))
+ #linux does not support loading dependent files, but android does
@expectedFailureNetBSD
def test_dependents_explicit_false_lib(self):
ctx = self.platformContext
Index: lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
@@ -39,9 +39,6 @@
self.do_target_command()
- # rdar://problem/9763907
- # 'target variable' command fails if the target program has been run
- @expectedFailureAndroid(archs=['aarch64'])
def test_target_variable_command(self):
"""Test 'target variable' command before and after starting the inferior."""
d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}
@@ -50,7 +47,6 @@
self.do_target_variable_command('globals')
- @expectedFailureAndroid(archs=['aarch64'])
def test_target_variable_command_no_fail(self):
"""Test 'target variable' command before and after starting the inferior."""
d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')}
Index: lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
@@ -363,7 +363,7 @@
# We can't find a breakpoint location for d_init before launching because
# executable dependencies are resolved relative to the debuggers PWD. Bug?
- @expectedFailureAll(oslist=["linux"])
+ @expectedFailureAll(oslist=["linux"], triple=no_match('aarch64-.*-android'))
@skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
@skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
@expectedFailureNetBSD
Index: lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
@@ -51,6 +51,7 @@
archs=[
"aarch64",
"arm"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr25338")
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
@expectedFailureNetBSD
@@ -76,6 +77,7 @@
archs=[
"aarch64",
"arm"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr25338")
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
@expectedFailureNetBSD
@@ -92,6 +94,7 @@
archs=[
"aarch64",
"arm"],
+ triple=no_match(".*-android"),
bugnumber="llvm.org/pr25338")
@expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
@expectedFailureNetBSD
Index: lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/deleted-executable/TestDeletedExecutable.py
@@ -18,7 +18,9 @@
NO_DEBUG_INFO_TESTCASE = True
@skipIfWindows # cannot delete a running executable
- @expectedFailureAll(oslist=["linux"]) # determining the architecture of the process fails
+ @expectedFailureAll(oslist=["linux"],
+ triple=no_match('aarch64-.*-android'))
+ # determining the architecture of the process fails
@expectedFailureNetBSD
def test(self):
self.build()
Index: lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
@@ -22,7 +22,6 @@
# LLDB supports hardware breakpoints for arm and aarch64 architectures.
@skipIf(archs=no_match(['arm', 'aarch64']))
- @expectedFailureAndroid
def test_hw_break_set_delete_multi_thread(self):
self.build()
self.setTearDownCleanup()
@@ -30,7 +29,6 @@
# LLDB supports hardware breakpoints for arm and aarch64 architectures.
@skipIf(archs=no_match(['arm', 'aarch64']))
- @expectedFailureAndroid
def test_hw_break_set_disable_multi_thread(self):
self.build()
self.setTearDownCleanup()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
