JDevlieghere created this revision.
JDevlieghere added reviewers: davide, friss.
JDevlieghere added a project: LLDB.
JDevlieghere requested review of this revision.
Currently, the `skipIfRosetta` decorator will skip tests with the message "not
on macOS" on non-macOS platforms. This triggers for example when running tests
remotely on device. Instead, it should only check the platform and architecture
when running on the Darwin/macOS platform.
Repository:
rLLDB LLDB
https://reviews.llvm.org/D85388
Files:
lldb/packages/Python/lldbsuite/test/decorators.py
Index: lldb/packages/Python/lldbsuite/test/decorators.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/decorators.py
+++ lldb/packages/Python/lldbsuite/test/decorators.py
@@ -538,10 +538,9 @@
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)
Index: lldb/packages/Python/lldbsuite/test/decorators.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/decorators.py
+++ lldb/packages/Python/lldbsuite/test/decorators.py
@@ -538,10 +538,9 @@
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)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
