From 79724fc0ae09671b2e75e6b1345c1e3fe6e49d1d Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Mon, 28 Nov 2016 12:15:19 +0000 Subject: [PATCH] skip android in @skipIfHostIncompatibleWithRemote The current implementation of the decorator does not skip if the android target arch is the same as host arch (as in both cases the platform comes out as linux). Nonetheless android x86_64 binaries are not compatible with linux ones. Technically this should be "skip if target is android and host is *not* android", but currently nobody runs lldb test suite on an android host, so we don't even have a way of specifying that the host is android. llvm-svn: 288027 --- lldb/packages/Python/lldbsuite/test/decorators.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py index ad7a9042b052..866923607867 100644 --- a/lldb/packages/Python/lldbsuite/test/decorators.py +++ b/lldb/packages/Python/lldbsuite/test/decorators.py @@ -617,9 +617,11 @@ def skipIfHostIncompatibleWithRemote(func): 'i386') and host_arch != target_arch: return "skipping because target %s is not compatible with host architecture %s" % ( target_arch, host_arch) - elif target_platform != host_platform: + if target_platform != host_platform: return "skipping because target is %s but host is %s" % ( target_platform, host_platform) + if lldbplatformutil.match_android_device(target_arch): + return "skipping because target is android" return None return skipTestIfFn(is_host_incompatible_with_remote)(func)