maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Skip TestCreateDuringInstructionStep on android aarch64 

we are unable to step through _M_start_thread due to atomic instruction sequences.

llvm-svn: 245552
This commit is contained in:
Pavel Labath 2015-08-20 11:37:19 +00:00
parent 7a4e1ba737
commit 090152bd1f
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/test/functionalities/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
View File

@ -25,6 +25,8 @@ class CreateDuringInstructionStepTestCase(TestBase):
self.create_during_step_inst_test()
@dwarf_test
@skipIfTargetAndroid(archs=['aarch64'])
@expectedFailureAndroid("llvm.org/pr23944", archs=['aarch64']) # We are unable to step through std::thread::_M_start_thread
def test_step_inst_with_dwarf(self):
self.buildDwarf(dictionary=self.getBuildFlags())
self.create_during_step_inst_test()
@ -62,7 +64,8 @@ class CreateDuringInstructionStepTestCase(TestBase):
# instruction, which creates the thread.
if thread.GetFrameAtIndex(0).GetFunctionName() in [
'__sync_fetch_and_add_4', # Android arm: unable to set a breakpoint for software single-step
'pthread_mutex_lock' # Android arm: function contains atomic instruction sequences
'pthread_mutex_lock', # Android arm: function contains atomic instruction sequences
'pthread_mutex_unlock' # Android arm: function contains atomic instruction sequences
]:
thread.StepOut()
else:

37
lldb/test/lldbtest.py
View File

@ -698,6 +698,18 @@ def expectedFailureWindows(bugnumber=None, compilers=None):
def expectedFailureHostWindows(bugnumber=None, compilers=None):
return expectedFailureHostOS(['windows'], bugnumber, compilers)
def matchAndroid(api_levels=None, archs=None):
def match(self):
if not target_is_android():
return False
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 match
def expectedFailureAndroid(bugnumber=None, api_levels=None, archs=None):
""" Mark a test as xfail for Android.
@ -708,15 +720,7 @@ def expectedFailureAndroid(bugnumber=None, api_levels=None, archs=None):
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 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)
return expectedFailure(matchAndroid(api_levels, archs), bugnumber)
# if the test passes on the first try, we're done (success)
# if the test fails once, then passes on the second try, raise an ExpectedFailure
@ -1061,12 +1065,14 @@ def skipIfi386(func):
func(*args, **kwargs)
return wrapper
def skipIfTargetAndroid(api_levels=None):
def skipIfTargetAndroid(api_levels=None, archs=None):
"""Decorator to skip tests when the target is Android.
Arguments:
api_levels - The API levels for which the test should be skipped. If
it is None, then the test will be skipped for all API levels.
arch - A sequence of architecture names specifying the architectures
for which a test is skipped. None means all architectures.
"""
def myImpl(func):
if isinstance(func, type) and issubclass(func, unittest2.TestCase):
@ -1076,14 +1082,9 @@ def skipIfTargetAndroid(api_levels=None):
def wrapper(*args, **kwargs):
from unittest2 import case
self = args[0]
if target_is_android():
if api_levels:
device_api = android_device_api()
if device_api and (device_api in api_levels):
self.skipTest(
"skip on Android target with API %d" % device_api)
else:
self.skipTest("skip on Android target")
if matchAndroid(api_levels, archs)(self):
self.skipTest("skiped on Android target with API %d and architecture %s" %
(android_device_api(), self.getArchitecture()))
func(*args, **kwargs)
return wrapper
return myImpl