Fix @skipUnlessPlatform and @skipIfPlatform decorators to work on entire test classes as well.

[flackr]

Summary

The decorators to skip if or unless certain platforms relied on calling skipTest, which only worked if they were decorating individual test cases. However for decorating entire classes it needs different behavior. This behavior is already encapsulated in unittest2.skipIf and unittest2.skipUnless so this patch modifies the platform decorators to use these unittest skip decorators.

[dawn]

Haven't run full tests, but patch runs previously skipped tests on OSX for:

./dotest.py -v -t --executable $LLDB_EXEC ./lang/objc/foundation

which used to run only 2 tests, and now runs 31. lgtm!

test/dotest.py

 setupSysPath()
 setupCrashInfoHook()
 
 #
 # If '-l' is specified, do not skip the long running tests.
 if not skip_long_running_test:
     os.environ["LLDB_SKIP_LONG_RUNNING_TEST"] = "NO"
 
-#
-# Walk through the testdirs while collecting tests.
-#
-for testdir in testdirs:
-    os.path.walk(testdir, visit, 'Test')
-
-#
-# Now that we have loaded all the test cases, run the whole test suite.
-#
-
 # For the time being, let's bracket the test runner within the
 # lldb.SBDebugger.Initialize()/Terminate() pair.
 import lldb
 
 # Create a singleton SBDebugger in the lldb namespace.
 lldb.DBG = lldb.SBDebugger.Create()
 
 if lldb_platform_name:

 
 # Don't do debugserver tests on everything except OS X.
 # Something for Windows here?
 dont_do_debugserver_test = "linux" in target_platform or "freebsd" in target_platform
 
 # Don't do lldb-server (llgs) tests on anything except Linux.
 dont_do_llgs_test = not ("linux" in target_platform)
 
+#
+# Walk through the testdirs while collecting tests.
+#
+for testdir in testdirs:
+    os.path.walk(testdir, visit, 'Test')
+
+#
+# Now that we have loaded all the test cases, run the whole test suite.
+#
+
 # Put the blacklist in the lldb namespace, to be used by lldb.TestBase.
 lldb.blacklist = blacklist
 
 # The pre_flight and post_flight come from reading a config file.
 lldb.pre_flight = pre_flight
 lldb.post_flight = post_flight
 def getsource_if_available(obj):
     """

test/lldbtest.py

 def skipIfWindows(func):
     """Decorate the item to skip tests that should be skipped on Windows."""
     return skipIfPlatform(["windows"])(func)
 
 def skipUnlessDarwin(func):
     """Decorate the item to skip tests that should be skipped on any non Darwin platform."""
     return skipUnlessPlatform(getDarwinOSTriples())(func)
 
+def getPlatform():
+    platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
+    if platform.startswith('freebsd'):
+        platform = 'freebsd'
+    return platform
+
 def skipIfPlatform(oslist):
     """Decorate the item to skip tests if running on one of the listed platforms."""
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            from unittest2 import case
-            self = args[0]
-            if self.getPlatform() in oslist:
-                self.skipTest("skip on %s" % (", ".join(oslist)))
-            else:
-                func(*args, **kwargs)
-        return wrapper
-    return decorator
+    return unittest2.skipIf(getPlatform() in oslist,
+                            "skip on %s" % (", ".join(oslist)))
 
 def skipUnlessPlatform(oslist):
     """Decorate the item to skip tests unless running on one of the listed platforms."""
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            from unittest2 import case
-            self = args[0]
-            if not (self.getPlatform() in oslist):
-                self.skipTest("requires one of %s" % (", ".join(oslist)))
-            else:
-                func(*args, **kwargs)
-        return wrapper
-    return decorator
+    return unittest2.skipUnless(getPlatform() in oslist,
+                                "requires on of %s" % (", ".join(oslist)))
 
 def skipIfLinuxClang(func):
     """Decorate the item to skip tests that should be skipped if building on 
        Linux with clang.
     """
     if isinstance(func, type) and issubclass(func, unittest2.TestCase):
         raise Exception("@skipIfLinuxClang can only be used to decorate a test method")
     @wraps(func)
class Base(unittest2.TestCase):
 
     def platformIsLinux(self):
         """Returns true if the OS triple for the selected platform is any valid apple OS"""
         platform_name = self.getPlatform()
         return platform_name == "linux"
 
     def getPlatform(self):
         """Returns the platform the test suite is running on."""
-        platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
-        if platform.startswith('freebsd'):
-            platform = 'freebsd'
-        return platform
+        return getPlatform()
 
     def isIntelCompiler(self):
         """ Returns true if using an Intel (ICC) compiler, false otherwise. """
         return any([x in self.getCompiler() for x in ["icc", "icpc", "icl"]])
 
     def expectedCompilerVersion(self, compiler_version):
         """Returns True iff compiler_version[1] matches the current compiler version.
            Use compiler_version[0] to specify the operator used to determine if a match has occurred.