replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[lldb] Fix bug in skipIfRosetta decorator 

Currently, the skipIfRosetta decorator will skip tests with the message
"not on macOS" on all platforms that are not `darwin` or `macosx`.
Instead, it should only check the platform and architecture when running
on these platforms.

This triggers for example when running the test suite on device.

Differential revision: https://reviews.llvm.org/D85388
This commit is contained in:
Jonas Devlieghere 2020-08-05 20:49:29 -07:00
parent 633e3dacf2
commit 4fccdd5c85
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lldb/packages/Python/lldbsuite/test/decorators.py
View File

@ -538,10 +538,9 @@ def skipIfNoSBHeaders(func):
def skipIfRosetta(bugnumber):
"""Skip a test when running the testsuite on macOS under the Rosetta translation layer."""
def is_running_rosetta(self):
if not lldbplatformutil.getPlatform() in ['darwin', 'macosx']:
return "not on macOS"
if (platform.uname()[5] == "arm") and (self.getArchitecture() == "x86_64"):
return "skipped under Rosetta"
if lldbplatformutil.getPlatform() in ['darwin', 'macosx']:
if (platform.uname()[5] == "arm") and (self.getArchitecture() == "x86_64"):
return "skipped under Rosetta"
return None
return skipTestIfFn(is_running_rosetta)