Revert "[sanitizer] Use COMPILER_RT_EMULATOR with gtests"

Missed review comments.

This reverts commit e25082961cb5aaafc817cb55593cf0ea8d3c4c22.

2 files changed, 1 insertions, 18 deletions

diff --git a/compiler-rt/unittests/lit.common.unit.cfg.py b/compiler-rt/unittests/lit.common.unit.cfg.py
index a0e2ca26ee84..fba034ae4fce 100644
--- a/compiler-rt/unittests/lit.common.unit.cfg.py
+++ b/compiler-rt/unittests/lit.common.unit.cfg.py
@@ -8,25 +8,9 @@ import os
 
 import lit.formats
 
-import shlex
-
-# Copied from libcxx's config.py
-def get_lit_conf(name, default=None):
-    # Allow overriding on the command line using --param=<name>=<val>
-    val = lit_config.params.get(name, None)
-    if val is None:
-        val = getattr(config, name, None)
-        if val is None:
-            val = default
-    return val
-
-emulator = get_lit_conf('emulator', None)
-if emulator:
-  emulator = shlex.split(emulator)
-
 # Setup test format
 llvm_build_mode = getattr(config, "llvm_build_mode", "Debug")
-config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test", emulator)
+config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test")
 
 # Setup test suffixes.
 config.suffixes = []
diff --git a/compiler-rt/unittests/lit.common.unit.configured.in b/compiler-rt/unittests/lit.common.unit.configured.in
index 29e1615ff28d..d959d43989ca 100644
--- a/compiler-rt/unittests/lit.common.unit.configured.in
+++ b/compiler-rt/unittests/lit.common.unit.configured.in
@@ -12,7 +12,6 @@ config.host_arch = "@HOST_ARCH@"
 config.host_os = "@HOST_OS@"
 config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@"
 config.gwp_asan = @COMPILER_RT_HAS_GWP_ASAN_PYBOOL@
-config.emulator = "@COMPILER_RT_EMULATOR@"
 
 # LLVM tools dir and build mode can be passed in lit parameters,
 # so try to apply substitution.