diff options
| -rw-r--r-- | compiler-rt/test/asan/Unit/lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | compiler-rt/test/asan/lit.cfg | 4 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/Unit/lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/lit.cfg | 4 | ||||
| -rw-r--r-- | compiler-rt/unittests/lit.common.unit.cfg | 7 |
5 files changed, 19 insertions, 0 deletions
diff --git a/compiler-rt/test/asan/Unit/lit.site.cfg.in b/compiler-rt/test/asan/Unit/lit.site.cfg.in index 55631a6d927..5dac134ee25 100644 --- a/compiler-rt/test/asan/Unit/lit.site.cfg.in +++ b/compiler-rt/test/asan/Unit/lit.site.cfg.in @@ -27,3 +27,5 @@ config.test_source_root = config.test_exec_root # Set LD_LIBRARY_PATH to pick dynamic runtime up properly. push_ld_library_path(config, config.compiler_rt_libdir) + +config.parallelism_group = config.darwin_sanitizer_parallelism_group_func diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg index 7703f5a31b0..78936d3c894 100644 --- a/compiler-rt/test/asan/lit.cfg +++ b/compiler-rt/test/asan/lit.cfg @@ -241,3 +241,7 @@ else: # Only run the tests on supported OSs. if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows']: config.unsupported = True + +if config.host_os == 'Darwin': + if config.target_arch in ["x86_64", "x86_64h"]: + config.parallelism_group = "darwin-64bit-sanitizer" diff --git a/compiler-rt/test/tsan/Unit/lit.site.cfg.in b/compiler-rt/test/tsan/Unit/lit.site.cfg.in index 23894a83985..5465810a1cc 100644 --- a/compiler-rt/test/tsan/Unit/lit.site.cfg.in +++ b/compiler-rt/test/tsan/Unit/lit.site.cfg.in @@ -11,3 +11,5 @@ config.name = 'ThreadSanitizer-Unit' # FIXME: De-hardcode this path. config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/tsan/tests" config.test_source_root = config.test_exec_root + +config.parallelism_group = config.darwin_sanitizer_parallelism_group_func diff --git a/compiler-rt/test/tsan/lit.cfg b/compiler-rt/test/tsan/lit.cfg index 5d82cc9d492..9fba28388d6 100644 --- a/compiler-rt/test/tsan/lit.cfg +++ b/compiler-rt/test/tsan/lit.cfg @@ -83,3 +83,7 @@ if config.host_os not in ['FreeBSD', 'Linux', 'Darwin']: # because the test hangs. if config.target_arch != 'aarch64': config.available_features.add('stable-runtime') + +if config.host_os == 'Darwin': + if config.target_arch in ["x86_64", "x86_64h"]: + config.parallelism_group = "darwin-64bit-sanitizer" diff --git a/compiler-rt/unittests/lit.common.unit.cfg b/compiler-rt/unittests/lit.common.unit.cfg index 2bd8f376f00..cd66f559925 100644 --- a/compiler-rt/unittests/lit.common.unit.cfg +++ b/compiler-rt/unittests/lit.common.unit.cfg @@ -28,3 +28,10 @@ if 'TMP' in os.environ: config.environment['TMP'] = os.environ['TMP'] if 'TEMP' in os.environ: config.environment['TEMP'] = os.environ['TEMP'] + +def darwin_sanitizer_parallelism_group_func(test): + if test.config.host_os == "Darwin": + if test.file_path.find("x86_64") != -1: + return "darwin-64bit-sanitizer" + return "" +config.darwin_sanitizer_parallelism_group_func = darwin_sanitizer_parallelism_group_func |
