Skip TestPluginCommands.py if host lldb library is incompatible with remote.

[flackr]

Summary

TestPluginCommands.py attempts to build a library which links against the host built lldb library. This will only work if the remote is compatible with binaries produced by the host.

[flackr]

Use + to concatenate the platform lists.

[tberghammer]

test/functionalities/plugins/commands/TestPluginCommands.py

23 ↗

(On Diff #25773)

We can remove this as the new decorator should catch this case

test/lldbtest.py

730 ↗

(On Diff #25773)

Please check the compatibility of the architectures also.

[flackr]

Check for compatible architecture as well as platform.

test/functionalities/plugins/commands/TestPluginCommands.py

23 ↗

(On Diff #25773)

Done.

test/lldbtest.py

730 ↗

(On Diff #25773)

Done, needed to switch to a test case wrapper to access the self object.

[tberghammer]

LGTM

lldb/trunk/test/functionalities/plugins/commands/TestPluginCommands.py

class PluginCommandTestCase(TestBase):
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         self.lib_dir = os.environ["LLDB_LIB_DIR"]
         self.implib_dir = os.environ["LLDB_IMPLIB_DIR"]
 
     @expectedFailureFreeBSD('llvm.org/pr17430')
-    @skipIfi386 # This test links against liblldb.so. Thus, the test requires a 32-bit liblldb.so.
     @skipIfNoSBHeaders
+    @skipIfHostIncompatibleWithRemote # Requires a compatible arch and platform to link against the host's built lldb lib.
     def test_load_plugin(self):
         """Test that plugins that load commands work correctly."""
 
         plugin_name = "plugin"
         if sys.platform.startswith("darwin"):
             plugin_lib_name = "lib%s.dylib" % plugin_name
         else:
             plugin_lib_name = "lib%s.so" % plugin_name

lldb/trunk/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():
-    """Returns the target platform the test suite is running on."""
+    """Returns the target platform which the tests are running on."""
     platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
     if platform.startswith('freebsd'):
         platform = 'freebsd'
     return platform
 
+def getHostPlatform():
+    """Returns the host platform running the test suite."""
+    # Attempts to return a platform name matching a target Triple platform.
+    if sys.platform.startswith('linux'):
+        return 'linux'
+    elif sys.platform.startswith('win32'):
+        return 'windows'
+    elif sys.platform.startswith('darwin'):
+        return 'darwin'
+    elif sys.platform.startswith('freebsd'):
+        return 'freebsd'
+    else:
+        return sys.platform
+
 def platformIsDarwin():
     """Returns true if the OS triple for the selected platform is any valid apple OS"""
     return getPlatform() in getDarwinOSTriples()
 
+def skipIfHostIncompatibleWithRemote(func):
+    """Decorate the item to skip tests if binaries built on this host are incompatible."""
+    if isinstance(func, type) and issubclass(func, unittest2.TestCase):
+        raise Exception("@skipIfHostIncompatibleWithRemote can only be used to decorate a test method")
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        from unittest2 import case
+        self = args[0]
+        host_arch = self.getLldbArchitecture()
+        host_platform = getHostPlatform()
+        target_arch = self.getArchitecture()
+        target_platform = 'darwin' if self.getPlatform() in getDarwinOSTriples() else self.getPlatform()
+        if not (target_arch == 'x86_64' and host_arch == 'i386') and host_arch != target_arch:
+            self.skipTest("skipping because target %s is not compatible with host architecture %s" % (target_arch, host_arch))
+        elif target_platform != host_platform:
+            self.skipTest("skipping because target is %s but host is %s" % (target_platform, host_platform))
+        else:
+            func(*args, **kwargs)
+    return wrapper
+
 def skipIfPlatform(oslist):
     """Decorate the item to skip tests if running on one of the listed platforms."""
     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."""
     return unittest2.skipUnless(getPlatform() in oslist,