[TestChangeProcessGroup] Mark the test as xfail for Android API 16

[sivachandra]

Summary

This change adds the infrastructure to mark tests as xfail for specific
Android API levels.

[chaoren]

test/lldbtest.py

450

Could you specifically check for adb:// scheme? It's conceivable that there could be a device with the name of localhost.

455

I'm not sure if it's possible for getprop to return anything else, but could you try/catch ValueError just in case?

700

int(device_api) seems unnecessary after int(stdout).

701

Just return device_api and (device_api in api_levels)?

Is it necessary to check if device_api is valid? None in list should just return false, right?

[labath]

lgtm, with one small comment.

test/lldbtest.py

696

This is missing an else clause.

Also, I think it would be more readable if you inverted the logic here:

if not match:
  return False
...

[sivachandra]

Address comments.

[sivachandra]

test/lldbtest.py

450

Done.

455

If int(...) fails, we want it to surface is it not?

700

Done.

701

Done the first part.

For the second part, checking for device_api is an optimization (which really does not matter here I guess) as otherwise the entire list is scanned looking for it even it is None.

[sivachandra]

test/lldbtest.py

696

This is the last statement in the function. It will return None if the "if ... " is not hit.

[chaoren]

test/lldbtest.py

449

I meant something like:

parsed = urlparse.urlparse(lldb.platform_url)

scheme = parsed.scheme
hostname = parsed.hostname

if scheme == "adb":
    device_id = hostname

[labath]

test/lldbtest.py

696

If that is the "python way" then ok, but the c programmer in me does not like it. :)

[sivachandra]

Address comment.

[sivachandra]

test/lldbtest.py

449

Ah, this is Android specific so I am not sure that is worth it. However, I have changed it.

Would an assert be more suitable?

assertEqual(scheme, "adb")

[chaoren]

test/lldbtest.py

450

You don't need and parsed.hostname != "localhost", the adb:// scheme is adb://device-id:port without ambiguity.

451

s/hostname/parsed.hostname/

[sivachandra]

Fix the "adb" scheme check. Chaoren explained to me offline that the
scheme could be "connect" or "adb"; When its "adb", the hostname is always
the device id. Similarly, if a device id has to be specified in
lldb.platform_url, then the "adb" scheme has to be used.

[chaoren]

LGTM

[chaoren]

test/lldbtest.py

50

Is python 3 even supported?

test/functionalities/process_group/TestChangeProcessGroup.py

class ChangeProcessGroupTestCase(TestBase):
     @skipUnlessDarwin
     @dsym_test
     def test_setpgid_with_dsym(self):
         self.buildDsym()
         self.setpgid()
 
     @skipIfFreeBSD # Times out on FreeBSD llvm.org/pr23731
     @skipIfWindows # setpgid call does not exist on Windows
+    @expectedFailureAndroid("http://llvm.org/pr23762", api_levels=[16])
     @dwarf_test
     def test_setpgid_with_dwarf(self):
         self.buildDwarf()
         self.setpgid()
 
     def run_platform_command(self, cmd):
         platform = self.dbg.GetSelectedPlatform()
         shell_command = lldb.SBPlatformShellCommand(cmd)

test/lldbtest.py

 import time
 import types
 import unittest2
 import lldb
 import lldbtest_config
 import lldbutil
 from _pyio import __metaclass__
 
+if sys.version_info.major < 3:
+    import urlparse
+else:
+    import urllib.parse as urlparse
+
 # dosep.py starts lots and lots of dotest instances
 # This option helps you find if two (or more) dotest instances are using the same
 # directory at the same time
 # Enable it to cause test failures and stderr messages if dotest instances try to run in
 # the same directory simultaneously
 # it is disabled by default because it litters the test directories with ".dirlock" files
 debug_confirm_directory_exclusivity = False
 
def getsource_if_available(obj):
     except:
         return repr(obj)
 
 def builder_module():
     if sys.platform.startswith("freebsd"):
         return __import__("builder_freebsd")
     return __import__("builder_" + sys.platform)
 
+def run_adb_command(cmd, device_id):
+    device_id_args = []
+    if device_id:
+        device_id_args = ["-s", device_id]
+    full_cmd = ["adb"] + device_id_args + cmd
+    p = Popen(full_cmd, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    return p.returncode, stdout, stderr
+
+def android_device_api():
+    device_id = None
+    if lldb.platform_url:
+        parsed = urlparse.urlparse(lldb.platform_url)
+        if parsed.scheme == "adb":
+            device_id = parsed.hostname
+    retcode, stdout, stderr = run_adb_command(
+        ["shell", "getprop", "ro.build.version.sdk"], device_id)
+    if retcode == 0:
+        return int(stdout)
+    else:
+        raise LookupError(
+            "Unable to determine the API level of the Android device.")
+
 #
 # Decorators for categorizing test cases.
 #
 
 from functools import wraps
 def python_api_test(func):
     """Decorate the item as a Python API only test."""
     if isinstance(func, type) and issubclass(func, unittest2.TestCase):
def expectedFailureFreeBSD(bugnumber=None, compilers=None):
     return expectedFailureOS(['freebsd'], bugnumber, compilers)
 
 def expectedFailureLinux(bugnumber=None, compilers=None):
     return expectedFailureOS(['linux'], bugnumber, compilers)
 
 def expectedFailureWindows(bugnumber=None, compilers=None):
     return expectedFailureOS(['windows'], bugnumber, compilers)
 
-def expectedFailureAndroid(bugnumber=None):
+def expectedFailureAndroid(bugnumber=None, api_levels=None):
+    """ Mark a test as xfail for Android.
+
+    Arguments:
+        bugnumber - The LLVM pr associated with the problem.
+        api_levels - A sequence of numbers specifying the Android API levels
+            for which a test is expected to fail.
+    """
     def fn(self):
         triple = self.dbg.GetSelectedPlatform().GetTriple()
-        return re.match(".*-.*-.*-android", triple)
+        match = re.match(".*-.*-.*-android", triple)
+        if match:
+            if not api_levels:
+                return True
+            device_api = android_device_api()
+            return device_api and (device_api in api_levels)
+
     return expectedFailure(fn, bugnumber)
 
 def expectedFailureLLGS(bugnumber=None, compilers=None):
     def fn(self):
         # llgs local is only an option on Linux targets
         if self.getPlatform() != 'linux':
             return False
         self.runCmd('settings show platform.plugin.linux.use-llgs-for-local')