[sanitizer] Use COMPILER_RT_EMULATOR with gtests Reviewed By: morehouse Differential Revision: https://reviews.llvm.org/D100998
diff --git a/compiler-rt/unittests/lit.common.unit.cfg.py b/compiler-rt/unittests/lit.common.unit.cfg.py index fba034a..4cf5bf7 100644 --- a/compiler-rt/unittests/lit.common.unit.cfg.py +++ b/compiler-rt/unittests/lit.common.unit.cfg.py
@@ -8,9 +8,21 @@ import lit.formats +# 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) + # Setup test format llvm_build_mode = getattr(config, "llvm_build_mode", "Debug") -config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test") +config.test_format = lit.formats.GoogleTest(llvm_build_mode, "Test", emulator) # 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 d959d43..29e1615 100644 --- a/compiler-rt/unittests/lit.common.unit.configured.in +++ b/compiler-rt/unittests/lit.common.unit.configured.in
@@ -12,6 +12,7 @@ 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.