[Lldb-commits] [lldb] r242887 - XFAIL watchpoint tests on Android arm/aarch64
Tamas Berghammer
tberghammer at google.com
Wed Jul 22 04:00:07 PDT 2015
Author: tberghammer
Date: Wed Jul 22 06:00:06 2015
New Revision: 242887
URL: http://llvm.org/viewvc/llvm-project?rev=242887&view=rev
Log:
XFAIL watchpoint tests on Android arm/aarch64
Differential revision: http://reviews.llvm.org/D11409
Modified:
lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
lldb/trunk/test/lldbtest.py
lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py
lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py
lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
Modified: lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py Wed Jul 22 06:00:06 2015
@@ -23,6 +23,7 @@ class HelloWatchLocationTestCase(TestBas
@expectedFailureFreeBSD("llvm.org/pr18832")
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_hello_watchlocation_with_dwarf(self):
"""Test watching a location with '-s size' option."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py Wed Jul 22 06:00:06 2015
@@ -23,6 +23,7 @@ class HelloWatchpointTestCase(TestBase):
self.hello_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_hello_watchpoint_with_dwarf_using_watchpoint_set(self):
"""Test a simple sequence of watchpoint creation and watchpoint hit."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py Wed Jul 22 06:00:06 2015
@@ -22,6 +22,7 @@ class WatchpointForMultipleThreadsTestCa
self.hello_multiple_threads()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_multiple_threads_with_dwarf(self):
"""Test that lldb watchpoint works for multiple threads."""
self.buildDwarf()
@@ -37,6 +38,7 @@ class WatchpointForMultipleThreadsTestCa
self.hello_multiple_threads_wp_set_and_then_delete()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_multiple_threads_wp_set_and_then_delete_with_dwarf(self):
"""Test that lldb watchpoint works for multiple threads, and after the watchpoint is deleted, the watchpoint event should no longer fires."""
self.buildDwarf()
Modified: lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py Wed Jul 22 06:00:06 2015
@@ -21,6 +21,7 @@ class TestStepOverWatchpoint(TestBase):
self.step_over_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_with_dwarf(self):
"""Test stepping over watchpoints."""
self.buildDwarf()
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Wed Jul 22 06:00:06 2015
@@ -35,6 +35,7 @@ class WatchpointCommandsTestCase(TestBas
self.normal_read_write_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_rw_watchpoint_with_dwarf(self):
"""Test read_write watchpoint and expect to stop two times."""
self.buildDwarf(dictionary=self.d)
@@ -50,6 +51,7 @@ class WatchpointCommandsTestCase(TestBas
self.delete_read_write_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_rw_watchpoint_delete_with_dwarf(self):
"""Test delete watchpoint and expect not to stop for watchpoint."""
self.buildDwarf(dictionary=self.d)
@@ -65,6 +67,7 @@ class WatchpointCommandsTestCase(TestBas
self.ignore_read_write_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_rw_watchpoint_set_ignore_count_with_dwarf(self):
"""Test watchpoint ignore count and expect to not to stop at all."""
self.buildDwarf(dictionary=self.d)
@@ -80,6 +83,7 @@ class WatchpointCommandsTestCase(TestBas
self.read_write_watchpoint_disable_after_first_stop()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_rw_disable_after_first_stop__with_dwarf(self):
"""Test read_write watchpoint but disable it after the first stop."""
self.buildDwarf(dictionary=self.d)
@@ -95,6 +99,7 @@ class WatchpointCommandsTestCase(TestBas
self.read_write_watchpoint_disable_then_enable()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_rw_disable_then_enable_with_dwarf(self):
"""Test read_write watchpoint, disable initially, then enable it."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py Wed Jul 22 06:00:06 2015
@@ -34,6 +34,7 @@ class WatchpointLLDBCommandTestCase(Test
self.watchpoint_command()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_command_with_dwarf(self):
"""Test 'watchpoint command'."""
self.buildDwarf(dictionary=self.d)
@@ -49,6 +50,7 @@ class WatchpointLLDBCommandTestCase(Test
self.watchpoint_command_can_disable_a_watchpoint()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_command_can_disable_a_watchpoint_with_dwarf(self):
"""Test that 'watchpoint command' action can disable a watchpoint after it is triggered."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py Wed Jul 22 06:00:06 2015
@@ -35,6 +35,7 @@ class WatchpointPythonCommandTestCase(Te
@dwarf_test
@skipIfFreeBSD # timing out on buildbot
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_command_with_dwarf(self):
"""Test 'watchpoint command'."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py Wed Jul 22 06:00:06 2015
@@ -34,6 +34,7 @@ class WatchpointConditionCmdTestCase(Tes
self.watchpoint_condition()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_cond_with_dwarf(self):
"""Test watchpoint condition."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py Wed Jul 22 06:00:06 2015
@@ -20,6 +20,7 @@ class TestWatchpointEvents (TestBase):
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_with_dwarf_and_python_api(self):
"""Test that adding, deleting and modifying watchpoints sends the appropriate events."""
self.buildDwarf()
Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py Wed Jul 22 06:00:06 2015
@@ -20,8 +20,9 @@ class WatchLocationUsingWatchpointSetTes
self.setTearDownCleanup()
self.watchlocation_using_watchpoint_set()
- @expectedFailureFreeBSD('llvm.org/pr18832')
@dwarf_test
+ @expectedFailureFreeBSD('llvm.org/pr18832')
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchlocation_with_dwarf_using_watchpoint_set(self):
"""Test watching a location with 'watchpoint set expression -w write -s size' option."""
self.buildDwarf()
Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Wed Jul 22 06:00:06 2015
@@ -698,20 +698,23 @@ def expectedFailureWindows(bugnumber=Non
def expectedFailureHostWindows(bugnumber=None, compilers=None):
return expectedFailureHostOS(['windows'], bugnumber, compilers)
-def expectedFailureAndroid(bugnumber=None, api_levels=None):
+def expectedFailureAndroid(bugnumber=None, api_levels=None, archs=None):
""" Mark a test as xfail for Android.
Arguments:
bugnumber - The LLVM pr associated with the problem.
api_levels - A sequence of numbers specifying the Android API levels
- for which a test is expected to fail.
+ for which a test is expected to fail. None means all API level.
+ arch - A sequence of architecture names specifying the architectures
+ for which a test is expected to fail. None means all architectures.
"""
def fn(self):
if target_is_android():
- if not api_levels:
- return True
- device_api = android_device_api()
- return device_api and (device_api in api_levels)
+ if archs is not None and self.getArchitecture() not in archs:
+ return False
+ if api_levels is not None and android_device_api() not in api_levels:
+ return False
+ return True
return expectedFailure(fn, bugnumber)
Modified: lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py Wed Jul 22 06:00:06 2015
@@ -30,6 +30,7 @@ class SetWatchpointAPITestCase(TestBase)
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watch_val_with_dwarf(self):
"""Exercise SBValue.Watch() API to set a watchpoint."""
self.buildDwarf()
Modified: lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py Wed Jul 22 06:00:06 2015
@@ -30,6 +30,7 @@ class WatchpointIgnoreCountTestCase(Test
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_set_watch_ignore_count_with_dwarf(self):
"""Test SBWatchpoint.SetIgnoreCount() API."""
self.buildDwarf()
Modified: lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py Wed Jul 22 06:00:06 2015
@@ -30,6 +30,7 @@ class WatchpointIteratorTestCase(TestBas
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watch_iter_with_dwarf(self):
"""Exercise SBTarget.watchpoint_iter() API to iterate on the available watchpoints."""
self.buildDwarf()
Modified: lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py (original)
+++ lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py Wed Jul 22 06:00:06 2015
@@ -34,6 +34,7 @@ class WatchpointConditionAPITestCase(Tes
self.watchpoint_condition_api()
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watchpoint_cond_api_with_dwarf(self):
"""Test watchpoint condition API."""
self.buildDwarf(dictionary=self.d)
Modified: lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py (original)
+++ lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py Wed Jul 22 06:00:06 2015
@@ -32,6 +32,7 @@ class SetWatchlocationAPITestCase(TestBa
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watch_location_with_dwarf(self):
"""Exercise SBValue.WatchPointee() API to set a watchpoint."""
self.buildDwarf()
Modified: lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py?rev=242887&r1=242886&r2=242887&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py (original)
+++ lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py Wed Jul 22 06:00:06 2015
@@ -32,6 +32,7 @@ class TargetWatchAddressAPITestCase(Test
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watch_address_with_dwarf(self):
"""Exercise SBTarget.WatchAddress() API to set a watchpoint."""
self.buildDwarf()
@@ -47,6 +48,7 @@ class TargetWatchAddressAPITestCase(Test
@python_api_test
@dwarf_test
+ @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
def test_watch_address_with_invalid_watch_size_with_dwarf(self):
"""Exercise SBTarget.WatchAddress() API but pass an invalid watch_size."""
self.buildDwarf()
More information about the lldb-commits
mailing list