Add deployment knobs to tests (for Apple platforms)
The tests for libc++ specify -target on the command-line to the compiler, but this is problematic for a few reasons. Firstly, the -target option isn't supported on Apple platforms. Parts of the triple get dropped and ignored. Instead, software should be compiled with a combination of the -arch and -m<name>-version-min options. Secondly, the generic "darwin" target references a kernel version instead of a platform version. Each platform has its own independent versions (with different versions of libc++.1.dylib), independent of the version of the Darwin kernel. This commit adds support to the LIT infrastructure for testing against Apple platforms using -arch and -platform options. If the host is not on OS X, or the compiler type is not clang or apple-clang, then this commit has NFC. If the host is on OS X and --param=target_triple=... is specified, then a warning is emitted to use arch and platform instead. Besides the warning, there's NFC. If the host is on OS X and *no* target-triple is specified, then use the new deployment target logic. This uses two new lit parameters, --param=arch=<arch> and --param=platform=<platform>. <platform> has the form <name>[<version>]. By default, arch is auto-detected from clang -dumpmachine, and platform is "macosx". If the platform doesn't have a version: For "macosx", the version is auto-detected from the host system using sw_vers. This may give a different version than the SDK, since new SDKs can be installed on older hosts. Otherwise, the version is auto-detected from the SDK version using xcrun --show-sdk-path. -arch <arch> -m<name>-version-min=<version> is added to the compiler flags. The target triple is computed as <arch>-apple-<platform>. It is *not* passed to clang, but it is available for XFAIL and UNSUPPORTED (as is with_system_cxx_lib=<target>). For convenience, apple-darwin and <arch>-apple-darwin are added to the set of available features. There were a number of tests marked to XFAIL on x86_64-apple-darwin11 and x86_64-apple-darwin12. I updated these to x86_64-apple-macosx10.7 and x86_64-apple-macosx10.8. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@297798 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -12,6 +12,7 @@ import lit.util # pylint: disable=import-error,no-name-in-module
|
||||
import locale
|
||||
import os
|
||||
import platform
|
||||
import re
|
||||
import sys
|
||||
|
||||
class DefaultTargetInfo(object):
|
||||
@@ -70,12 +71,62 @@ class DarwinLocalTI(DefaultTargetInfo):
|
||||
def __init__(self, full_config):
|
||||
super(DarwinLocalTI, self).__init__(full_config)
|
||||
|
||||
def is_host_macosx(self):
|
||||
name = lit.util.capture(['sw_vers', '-productName']).strip()
|
||||
return name == "Mac OS X"
|
||||
|
||||
def get_macosx_version(self):
|
||||
assert self.is_host_macosx()
|
||||
version = lit.util.capture(['sw_vers', '-productVersion']).strip()
|
||||
version = re.sub(r'([0-9]+\.[0-9]+)(\..*)?', r'\1', version)
|
||||
return version
|
||||
|
||||
def get_sdk_version(self, name):
|
||||
assert self.is_host_macosx()
|
||||
cmd = ['xcrun', '--sdk', name, '--show-sdk-path']
|
||||
try:
|
||||
out = lit.util.capture(cmd).strip()
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
if not out:
|
||||
self.full_config.lit_config.fatal(
|
||||
"cannot infer sdk version with: %r" % cmd)
|
||||
|
||||
return re.sub(r'.*/[^0-9]+([0-9.]+)\.sdk', r'\1', out)
|
||||
|
||||
def get_platform(self):
|
||||
platform = self.full_config.get_lit_conf('platform')
|
||||
if platform:
|
||||
platform = re.sub(r'([^0-9]+)([0-9\.]*)', r'\1-\2', platform)
|
||||
name, version = tuple(platform.split('-', 1))
|
||||
else:
|
||||
name = 'macosx'
|
||||
version = None
|
||||
|
||||
if version:
|
||||
return (False, name, version)
|
||||
|
||||
# Infer the version, either from the SDK or the system itself. For
|
||||
# macosx, ignore the SDK version; what matters is what's at
|
||||
# /usr/lib/libc++.dylib.
|
||||
if name == 'macosx':
|
||||
version = self.get_macosx_version()
|
||||
else:
|
||||
version = self.get_sdk_version(name)
|
||||
return (True, name, version)
|
||||
|
||||
def add_locale_features(self, features):
|
||||
add_common_locales(features, self.full_config.lit_config)
|
||||
|
||||
def add_cxx_compile_flags(self, flags):
|
||||
if self.full_config.use_deployment:
|
||||
_, name, _ = self.full_config.config.deployment
|
||||
cmd = ['xcrun', '--sdk', name, '--show-sdk-path']
|
||||
else:
|
||||
cmd = ['xcrun', '--show-sdk-path']
|
||||
try:
|
||||
out = lit.util.capture(['xcrun', '--show-sdk-path']).strip()
|
||||
out = lit.util.capture(cmd).strip()
|
||||
res = 0
|
||||
except OSError:
|
||||
res = -1
|
||||
|
||||
Reference in New Issue
Block a user