[TestGdbRemoteAbort] Skip on API 16 Android devices

[sivachandra]

Summary

This change also adds the infrastructure required to specify the API
levels for which tests should be skipped.

[tberghammer]

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

35

Why do we want to skip this test for API=16?

[sivachandra]

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

35

For API 16, std::abort raises SIGSEGV and not SIGABRT.

[labath]

test/lldbtest.py

945

Why do we need two levels of nested functions here?
The original code seemed to manage just fine with one...

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

35

Please add a short comment explaining why is this skipped.

[sivachandra]

test/lldbtest.py

945

This is per my knowledge of decorators: I think when a decorator takes args, it needs to return a decorator itself. Correct me if I am wrong.

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

35

Will do.

[labath]

lgtm

[sivachandra]

Address comments.
Fix other occurances of skipIfTargetAndroid.

test/functionalities/avoids-fd-leak/TestFdLeak.py

 
 class AvoidsFdLeakTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
     @expectedFailureLinux # xfail flakey test to get buildbot green
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
-    @skipIfTargetAndroid # Android have some other file descriptors open by the shell
+    @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
     def test_fd_leak_basic (self):
         self.do_test([])
 
     @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
-    @skipIfTargetAndroid # Android have some other file descriptors open by the shell
+    @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
     def test_fd_leak_log (self):
         self.do_test(["log enable -f '/dev/null' lldb commands"])
 
     def do_test (self, commands):
         self.buildDefault()
         exe = os.path.join (os.getcwd(), "a.out")
 
         for c in commands:
             self.runCmd(c)
 
         target = self.dbg.CreateTarget(exe)
 
         process = target.LaunchSimple (None, None, self.get_process_working_directory())
         self.assertTrue(process, PROCESS_IS_VALID)
 
         self.assertTrue(process.GetState() == lldb.eStateExited, "Process should have exited.")
         self.assertTrue(process.GetExitStatus() == 0,
                 "Process returned non-zero status. Were incorrect file descriptors passed?")
 
     @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
     @expectedFailureLinux # xfail flakey test to get buildbot green
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
-    @skipIfTargetAndroid # Android have some other file descriptors open by the shell
+    @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
     def test_fd_leak_multitarget (self):
         self.buildDefault()
         exe = os.path.join (os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
         breakpoint = target.BreakpointCreateBySourceRegex ('Set breakpoint here', lldb.SBFileSpec ("main.c", False))
         self.assertTrue(breakpoint, VALID_BREAKPOINT)
 

test/functionalities/signal/raise/TestRaise.py

class RaiseTestCase(TestBase):
     def test_sigstop_with_dwarf(self):
         self.buildDwarf()
         self.signal_test('SIGSTOP', False)
         # passing of SIGSTOP is not correctly handled, so not testing that scenario: https://llvm.org/bugs/show_bug.cgi?id=23574
 
     @skipIfWindows # signals do not exist on Windows
     @dwarf_test
     @skipIfDarwin # darwin does not support real time signals
-    @skipIfTargetAndroid
+    @skipIfTargetAndroid()
     def test_sigsigrtmin_with_dwarf(self):
         self.buildDwarf()
         self.signal_test('SIGRTMIN', True)
 
     def launch(self, target, signal):
         # launch the process, do not stop at entry point.
         process = target.LaunchSimple([signal], None, self.get_process_working_directory())
         self.assertTrue(process, PROCESS_IS_VALID)

test/lldbtest.py

def wrapper(*args, **kwargs):
         from unittest2 import case
         self = args[0]
         if "i386" == self.getArchitecture():
             self.skipTest("skipping because i386 is not a supported architecture")
         else:
             func(*args, **kwargs)
     return wrapper
 
-def skipIfTargetAndroid(func):
-    """Decorate the item to skip tests that should be skipped when the target is Android."""
+def skipIfTargetAndroid(api_levels=None):
+    """Decorator to skip tests when the target is Android.
+
+    Arguments:
+        api_levels - The API levels for which the test should be skipped. If
+            it is None, then the test will be skipped for all API levels.
+    """
+    def myImpl(func):
         if isinstance(func, type) and issubclass(func, unittest2.TestCase):
-        raise Exception("@skipIfTargetAndroid can only be used to decorate a test method")
+            raise Exception("@skipIfTargetAndroid can only be used to "
+                            "decorate a test method")
         @wraps(func)
         def wrapper(*args, **kwargs):
             from unittest2 import case
             self = args[0]
             triple = self.dbg.GetSelectedPlatform().GetTriple()
             if re.match(".*-.*-.*-android", triple):
-            self.skipTest("skip on Android target")
+                if api_levels:
+                    device_api = android_device_api()
+                    if device_api and (device_api in api_levels):
+                        self.skipTest(
+                            "skip on Android target with API %d" % device_api)
                 else:
+                    self.skipTest("skip on Android target")
             func(*args, **kwargs)
         return wrapper
+    return myImpl
 
 def skipUnlessCompilerRt(func):
     """Decorate the item to skip tests if testing remotely."""
     if isinstance(func, type) and issubclass(func, unittest2.TestCase):
         raise Exception("@skipUnless can only be used to decorate a test method")
     @wraps(func)
     def wrapper(*args, **kwargs):
         from unittest2 import case

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

class TestGdbRemoteAbort(gdbremote_testcase.GdbRemoteTestCaseBase):
     @dsym_test
     def test_inferior_abort_received_debugserver_dsym(self):
         self.init_debugserver_test()
         self.buildDsym()
         self.inferior_abort_received()
 
     @llgs_test
     @dwarf_test
+    @skipIfTargetAndroid(api_levels=[16]) # abort() on API 16 raises SIGSEGV!
     def test_inferior_abort_received_llgs_dwarf(self):
         self.init_llgs_test()
         self.buildDwarf()
         self.inferior_abort_received()