summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Lettner <jlettner@apple.com>2019-02-28 19:26:53 +0000
committerJulian Lettner <jlettner@apple.com>2019-02-28 19:26:53 +0000
commitb79f1f2e2a0e77e7d7c71ff95f145ec920e4947d (patch)
treedadd562088ef84477c00e344a274607eeffb328c
parent0a039660fa85f725f693b5de3bf207df22bcca3d (diff)
downloadbcm5719-llvm-b79f1f2e2a0e77e7d7c71ff95f145ec920e4947d.tar.gz
bcm5719-llvm-b79f1f2e2a0e77e7d7c71ff95f145ec920e4947d.zip
[Sanitizer] lit test config: Respect existing parallelism_group
llvm-svn: 355128
-rw-r--r--compiler-rt/test/asan/lit.cfg3
-rw-r--r--compiler-rt/test/fuzzer/lit.cfg3
-rw-r--r--compiler-rt/test/sanitizer_common/lit.common.cfg3
-rw-r--r--compiler-rt/test/tsan/lit.cfg3
4 files changed, 8 insertions, 4 deletions
diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg
index 143cd3be98a..05878a8ef97 100644
--- a/compiler-rt/test/asan/lit.cfg
+++ b/compiler-rt/test/asan/lit.cfg
@@ -220,4 +220,5 @@ else:
if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'SunOS', 'Windows', 'NetBSD']:
config.unsupported = True
-config.parallelism_group = 'shadow-memory'
+if not config.parallelism_group:
+ config.parallelism_group = 'shadow-memory'
diff --git a/compiler-rt/test/fuzzer/lit.cfg b/compiler-rt/test/fuzzer/lit.cfg
index 6f2a4dacae2..b9e351432e0 100644
--- a/compiler-rt/test/fuzzer/lit.cfg
+++ b/compiler-rt/test/fuzzer/lit.cfg
@@ -114,4 +114,5 @@ if default_asan_opts_str:
config.substitutions.append(('%env_asan_opts=',
'env ASAN_OPTIONS=' + default_asan_opts_str))
-config.parallelism_group = 'shadow-memory'
+if not config.parallelism_group:
+ config.parallelism_group = 'shadow-memory'
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg
index 8457f92d732..a9965f070f8 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg
@@ -71,4 +71,5 @@ config.suffixes = ['.c', '.cc', '.cpp']
if config.host_os not in ['Linux', 'Darwin', 'NetBSD', 'FreeBSD']:
config.unsupported = True
-config.parallelism_group = 'shadow-memory'
+if not config.parallelism_group:
+ config.parallelism_group = 'shadow-memory'
diff --git a/compiler-rt/test/tsan/lit.cfg b/compiler-rt/test/tsan/lit.cfg
index 8dc5228457d..50c8a5eea02 100644
--- a/compiler-rt/test/tsan/lit.cfg
+++ b/compiler-rt/test/tsan/lit.cfg
@@ -86,4 +86,5 @@ if config.host_os not in ['FreeBSD', 'Linux', 'Darwin', 'NetBSD']:
if config.android:
config.unsupported = True
-config.parallelism_group = 'shadow-memory'
+if not config.parallelism_group:
+ config.parallelism_group = 'shadow-memory'
OpenPOWER on IntegriCloud