Skip to content

[lldb][swift] Make swiftTest decorator not always skip #2010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lldb/packages/Python/lldbsuite/test/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,8 @@ def skipUnlessTargetAndroid(func):
def swiftTest(func):
"""Decorate the item as a Swift test (Darwin/Linux only, no i386)."""
def is_not_swift_compatible(self):
swift_enabled_error = _get_bool_config_skip_if_decorator("swift")(func)
if swift_enabled_error:
return swift_enabled_error
if not _get_bool_config("swift"):
return "Swift plugin not enabled"
if self.getDebugInfo() == "gmodules":
return "skipping (gmodules only makes sense for clang tests)"

Expand Down Expand Up @@ -883,11 +882,14 @@ def skipIfAsan(func):
"""Skip this test if the environment is set up to run LLDB *itself* under ASAN."""
return skipTestIfFn(is_running_under_asan)(func)

def _get_bool_config_skip_if_decorator(key):
def _get_bool_config(key):
config = lldb.SBDebugger.GetBuildConfiguration()
value_node = config.GetValueForKey(key)
fail_value = True # More likely to notice if something goes wrong
have = value_node.GetValueForKey("value").GetBooleanValue(fail_value)
return value_node.GetValueForKey("value").GetBooleanValue(fail_value)

def _get_bool_config_skip_if_decorator(key):
have = _get_bool_config(key)
return unittest2.skipIf(not have, "requires " + key)

def skipIfCursesSupportMissing(func):
Expand Down