Choose stdlib for test suite based on target platform.

[flackr]

Summary

When compiling programs for the test suite we currently choose which stdlib to use based on the host platform, but should be basing this on the target platform.

[clayborg]

A few changes, See inlined comments.

test/lldbtest.py

1687 ↗

(On Diff #25877)

use

self.platformIsDarwin()

instead of:

self.getPlatform() in getDarwinOSTriples()

1737 ↗

(On Diff #25877)

use `self.platformIsDarwin()`

1824 ↗

(On Diff #25877)

use `self.platformIsDarwin()`

1841 ↗

(On Diff #25877)

use `self.platformIsDarwin()`

[flackr]

Use platformIsDarwin instead of manually checking if the platform is in darwin triples.

[flackr]

And done in one more location that slipped by before :-).

test/lldbtest.py

1687 ↗

(On Diff #25877)

Done.

1737 ↗

(On Diff #25877)

Done.

1824 ↗

(On Diff #25877)

Done.

1841 ↗

(On Diff #25877)

Done.

[clayborg]

Looks good.

lldb/trunk/test/lldbtest.py

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()
+        target_platform = 'darwin' if self.platformIsDarwin() 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 getRunOptions(self):
         return option_str
 
     # ==================================================
     # Build methods supported through a plugin interface
     # ==================================================
 
     def getstdlibFlag(self):
         """ Returns the proper -stdlib flag, or empty if not required."""
-        if sys.platform.startswith("darwin") or sys.platform.startswith("freebsd"):
+        if self.platformIsDarwin() or self.getPlatform() == "freebsd":
             stdlibflag = "-stdlib=libc++"
         else:
             stdlibflag = ""
         return stdlibflag
 
     def getstdFlag(self):
         """ Returns the proper stdflag. """
         if "gcc" in self.getCompiler() and "4.6" in self.getCompilerVersion():
def buildDriver(self, sources, exe_name):
 
         self.buildDefault(dictionary=d)
 
     def buildLibrary(self, sources, lib_name):
         """Platform specific way to build a default library. """
 
         stdflag = self.getstdFlag()
 
-        if sys.platform.startswith("darwin"):
+        if self.platformIsDarwin():
             dsym = os.path.join(self.lib_dir, 'LLDB.framework', 'LLDB')
             d = {'DYLIB_CXX_SOURCES' : sources,
                  'DYLIB_NAME' : lib_name,
                  'CFLAGS_EXTRAS' : "%s -stdlib=libc++" % stdflag,
                  'FRAMEWORK_INCLUDES' : "-F%s" % self.lib_dir,
                  'LD_EXTRAS' : "%s -Wl,-rpath,%s -dynamiclib" % (dsym, self.lib_dir),
                 }
-        elif sys.platform.startswith('freebsd') or sys.platform.startswith("linux") or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile':
+        elif self.getPlatform() == 'freebsd' or self.getPlatform() == 'linux' or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile':
             d = {'DYLIB_CXX_SOURCES' : sources,
                  'DYLIB_NAME' : lib_name,
                  'CFLAGS_EXTRAS' : "%s -I%s -fPIC" % (stdflag, os.path.join(os.environ["LLDB_SRC"], "include")),
                  'LD_EXTRAS' : "-shared -L%s -llldb" % self.lib_dir}
-        elif sys.platform.startswith("win"):
+        elif self.getPlatform() == 'windows':
             d = {'DYLIB_CXX_SOURCES' : sources,
                  'DYLIB_NAME' : lib_name,
                  'CFLAGS_EXTRAS' : "%s -I%s -fPIC" % (stdflag, os.path.join(os.environ["LLDB_SRC"], "include")),
                  'LD_EXTRAS' : "-shared -l%s\liblldb.lib" % self.implib_dir}
         if self.TraceOn():
             print "Building LLDB Library (%s) from sources %s" % (lib_name, sources)
 
         self.buildDefault(dictionary=d)
class Base(unittest2.TestCase):
     def getBuildFlags(self, use_cpp11=True, use_libcxx=False, use_libstdcxx=False):
         """ Returns a dictionary (which can be provided to build* functions above) which
             contains OS-specific build flags.
         """
         cflags = ""
         ldflags = ""
 
         # On Mac OS X, unless specifically requested to use libstdc++, use libc++
-        if not use_libstdcxx and sys.platform.startswith('darwin'):
+        if not use_libstdcxx and self.platformIsDarwin():
             use_libcxx = True
 
         if use_libcxx and self.libcxxPath:
             cflags += "-stdlib=libc++ "
             if self.libcxxPath:
                 libcxxInclude = os.path.join(self.libcxxPath, "include")
                 libcxxLib = os.path.join(self.libcxxPath, "lib")
                 if os.path.isdir(libcxxInclude) and os.path.isdir(libcxxLib):
                     cflags += "-nostdinc++ -I%s -L%s -Wl,-rpath,%s " % (libcxxInclude, libcxxLib, libcxxLib)
 
         if use_cpp11:
             cflags += "-std="
             if "gcc" in self.getCompiler() and "4.6" in self.getCompilerVersion():
                 cflags += "c++0x"
             else:
                 cflags += "c++11"
-        if sys.platform.startswith("darwin") or sys.platform.startswith("freebsd"):
+        if self.platformIsDarwin() or self.getPlatform() == "freebsd":
             cflags += " -stdlib=libc++"
         elif "clang" in self.getCompiler():
             cflags += " -stdlib=libstdc++"
 
         return {'CFLAGS_EXTRAS' : cflags,
                 'LD_EXTRAS' : ldflags,
                }