averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Greg Parker
2017-06-28 15:25:17 -07:00
parent aff8d06b6a 5d8fa8f10e
commit 7b009eccde
629 changed files with 21576 additions and 10961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
utils/build-script
View File

@@ -147,6 +147,11 @@ class HostSpecificConfiguration(object):
test = False
name = deployment_target.name
for skip_test_arch in invocation.platforms_archs_to_skip_test:
if deployment_target.name == skip_test_arch.name:
test = False
if build:
# Validation and long tests require building the full standard
# library, whereas the other targets can build a slightly
@@ -499,6 +504,7 @@ class BuildScriptInvocation(object):
self.platforms_to_skip_build.add(StdlibDeploymentTarget.Android)
self.platforms_to_skip_test = set()
self.platforms_archs_to_skip_test = set()
if args.skip_test_linux:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.Linux)
if args.skip_test_freebsd:
@@ -515,6 +521,9 @@ class BuildScriptInvocation(object):
if args.skip_test_ios_simulator:
self.platforms_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator)
if args.skip_test_ios_32bit_simulator:
self.platforms_archs_to_skip_test.add(
StdlibDeploymentTarget.iOSSimulator.i386)
if args.skip_test_tvos_host:
self.platforms_to_skip_test.add(StdlibDeploymentTarget.AppleTV)
else:
@@ -682,6 +691,14 @@ class BuildScriptInvocation(object):
# NOT pass them to build-script-impl.
if args.enable_asan:
impl_args += ["--enable-asan"]
# If we have lsan, we need to export our suppression list. The actual
# passing in of the LSAN flag is done via the normal cmake method. We
# do not pass the flag to build-script-impl.
if args.enable_lsan:
supp_file = os.path.join(SWIFT_SOURCE_ROOT, SWIFT_REPO_NAME,
"utils",
"lsan_leaks_suppression_list.txt")
os.environ['LSAN_OPTIONS'] = 'suppressions={}'.format(supp_file)
if args.verbose_build:
impl_args += ["--verbose-build"]
if args.install_symroot:
@@ -772,6 +789,8 @@ class BuildScriptInvocation(object):
impl_args += ["--skip-test-ios-host"]
if args.skip_test_ios_simulator:
impl_args += ["--skip-test-ios-simulator"]
if args.skip_test_ios_32bit_simulator:
impl_args += ["--skip-test-ios-32bit-simulator"]
if args.skip_test_tvos_host:
impl_args += ["--skip-test-tvos-host"]
if args.skip_test_tvos_simulator:
@@ -1780,6 +1799,11 @@ iterations with -O",
"--skip-test-ios-simulator",
help="skip testing iOS simulator targets",
action=arguments.action.optional_bool)
skip_test_group.add_argument(
"--skip-test-ios-32bit-simulator",
help="skip testing iOS 32 bit simulator targets",
action=arguments.action.optional_bool,
default=True)
skip_test_group.add_argument(
"--skip-test-ios-host",
help="skip testing iOS device targets on the host machine (the phone "
@@ -2018,6 +2042,10 @@ iterations with -O",
parser.add_argument(
"--enable-tsan-runtime",
help="enable Thread Sanitizer on the swift runtime")
parser.add_argument(
"--enable-lsan",
help="enable Leak Sanitizer for swift tools",
action=arguments.action.optional_bool)
parser.add_argument(
"--compiler-vendor",