From 6e3d368ee059a161aeb02b3f6c4a9a7bb08f480b Mon Sep 17 00:00:00 2001
From: Kuba Mracek <mracek@apple.com>
Date: Tue, 17 Jan 2017 18:06:07 +0000
Subject: Revert r292232.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@292236 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/asan/Unit/lit.site.cfg.in | 2 --
 test/asan/lit.cfg              | 4 ----
 test/tsan/Unit/lit.site.cfg.in | 2 --
 test/tsan/lit.cfg              | 4 ----
 unittests/lit.common.unit.cfg  | 7 -------
 5 files changed, 19 deletions(-)

diff --git a/test/asan/Unit/lit.site.cfg.in b/test/asan/Unit/lit.site.cfg.in
index 5dac134ee..55631a6d9 100644
--- a/test/asan/Unit/lit.site.cfg.in
+++ b/test/asan/Unit/lit.site.cfg.in
@@ -27,5 +27,3 @@ 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/test/asan/lit.cfg b/test/asan/lit.cfg
index 78936d3c8..7703f5a31 100644
--- a/test/asan/lit.cfg
+++ b/test/asan/lit.cfg
@@ -241,7 +241,3 @@ 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/test/tsan/Unit/lit.site.cfg.in b/test/tsan/Unit/lit.site.cfg.in
index 5465810a1..23894a839 100644
--- a/test/tsan/Unit/lit.site.cfg.in
+++ b/test/tsan/Unit/lit.site.cfg.in
@@ -11,5 +11,3 @@ 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/test/tsan/lit.cfg b/test/tsan/lit.cfg
index 9fba28388..5d82cc9d4 100644
--- a/test/tsan/lit.cfg
+++ b/test/tsan/lit.cfg
@@ -83,7 +83,3 @@ 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/unittests/lit.common.unit.cfg b/unittests/lit.common.unit.cfg
index cd66f5599..2bd8f376f 100644
--- a/unittests/lit.common.unit.cfg
+++ b/unittests/lit.common.unit.cfg
@@ -28,10 +28,3 @@ 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
-- 
cgit v1.2.3