[Sanitizer] iOS: Pull up parallelism_group handling into common.lit.config

Serial execution on iOS devices is not specific to sanitizers. We want
to throttle all on-device tests. Pull the setting of the
parallelism_group up into the common lit configuration file.

Rename `darwin-ios-device-sanitizer` to `ios-device`. This group is not
specific to sanitizers and (theoretically) independent from the host OS.

Note that we don't support running unit tests on-device (there are no
configurations generated for that). If that ever changes, we also need
this configuration in `unittests/lit.common.unit.cfg`.

Reviewers: delcypher

Differential Revision: https://reviews.llvm.org/D58209

llvm-svn: 354179
This commit is contained in:
Julian Lettner 2019-02-15 22:12:36 +00:00
parent db2f084aa9
commit 68c6764c20
6 changed files with 3 additions and 17 deletions

View File

@ -223,5 +223,3 @@ if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'SunOS', 'Windows', 'Net
if config.host_os == 'Darwin': if config.host_os == 'Darwin':
if config.target_arch in ["x86_64", "x86_64h"]: if config.target_arch in ["x86_64", "x86_64h"]:
config.parallelism_group = "darwin-64bit-sanitizer" config.parallelism_group = "darwin-64bit-sanitizer"
elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
config.parallelism_group = "darwin-ios-device-sanitizer"

View File

@ -129,5 +129,3 @@ config.substitutions.append(('%env_asan_opts=',
if config.host_os == 'Darwin': if config.host_os == 'Darwin':
if config.target_arch in ["x86_64", "x86_64h"]: if config.target_arch in ["x86_64", "x86_64h"]:
config.parallelism_group = "darwin-64bit-sanitizer" config.parallelism_group = "darwin-64bit-sanitizer"
elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
config.parallelism_group = "darwin-ios-device-sanitizer"

View File

@ -407,12 +407,11 @@ if platform.system() == 'Windows':
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
lit_config.parallelism_groups["darwin-64bit-sanitizer"] = 3 lit_config.parallelism_groups["darwin-64bit-sanitizer"] = 3
# The current implementation of the tools in sanitizer_common/ios_comamnds # Force sequential execution when running tests on iOS devices.
# do not support parallel execution so force sequential execution of the
# tests on iOS devices.
if config.host_os == 'Darwin' and config.apple_platform != "osx" and not config.apple_platform.endswith("sim"): if config.host_os == 'Darwin' and config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
lit_config.warning("iOS device test cases being run sequentially") lit_config.warning("iOS device test cases being run sequentially")
lit_config.parallelism_groups["darwin-ios-device-sanitizer"] = 1 lit_config.parallelism_groups["ios-device"] = 1
config.parallelism_group = "ios-device"
# Multiple substitutions are necessary to support multiple shared objects used # Multiple substitutions are necessary to support multiple shared objects used
# at once. # at once.

View File

@ -74,5 +74,3 @@ if config.host_os not in ['Linux', 'Darwin', 'NetBSD', 'FreeBSD']:
if config.host_os == 'Darwin': if config.host_os == 'Darwin':
if config.target_arch in ["x86_64", "x86_64h"]: if config.target_arch in ["x86_64", "x86_64h"]:
config.parallelism_group = "darwin-64bit-sanitizer" config.parallelism_group = "darwin-64bit-sanitizer"
elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
config.parallelism_group = "darwin-ios-device-sanitizer"

View File

@ -88,5 +88,3 @@ if config.android:
if config.host_os == 'Darwin': if config.host_os == 'Darwin':
if config.target_arch in ["x86_64", "x86_64h"]: if config.target_arch in ["x86_64", "x86_64h"]:
config.parallelism_group = "darwin-64bit-sanitizer" config.parallelism_group = "darwin-64bit-sanitizer"
elif config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
config.parallelism_group = "darwin-ios-device-sanitizer"

View File

@ -74,8 +74,3 @@ if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows', 'NetBSD', 'Su
config.available_features.add('arch=' + config.target_arch) config.available_features.add('arch=' + config.target_arch)
config.excludes = ['Inputs'] config.excludes = ['Inputs']
# Limit parallelism if necessary
if config.host_os == 'Darwin':
if config.apple_platform != "osx" and not config.apple_platform.endswith("sim"):
config.parallelism_group = "darwin-ios-device-sanitizer"