forked from OSchip/llvm-project
Revert "[sanitizer] Use COMPILER_RT_EMULATOR with gtests"
Missed review comments.
This reverts commit e25082961c
.
This commit is contained in:
parent
424d6cb902
commit
686328263e
|
@ -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 = []
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -11,7 +11,7 @@ from .base import TestFormat
|
|||
kIsWindows = sys.platform in ['win32', 'cygwin']
|
||||
|
||||
class GoogleTest(TestFormat):
|
||||
def __init__(self, test_sub_dirs, test_suffix, run_under = []):
|
||||
def __init__(self, test_sub_dirs, test_suffix):
|
||||
self.test_sub_dirs = str(test_sub_dirs).split(';')
|
||||
|
||||
# On Windows, assume tests will also end in '.exe'.
|
||||
|
@ -21,7 +21,6 @@ class GoogleTest(TestFormat):
|
|||
|
||||
# Also check for .py files for testing purposes.
|
||||
self.test_suffixes = {exe_suffix, test_suffix + '.py'}
|
||||
self.run_under = run_under
|
||||
|
||||
def getGTestTests(self, path, litConfig, localConfig):
|
||||
"""getGTestTests(path) - [name]
|
||||
|
@ -33,7 +32,7 @@ class GoogleTest(TestFormat):
|
|||
litConfig: LitConfig instance
|
||||
localConfig: TestingConfig instance"""
|
||||
|
||||
list_test_cmd = self.prepareCmd([path, '--gtest_list_tests'])
|
||||
list_test_cmd = self.maybeAddPythonToCmd([path, '--gtest_list_tests'])
|
||||
|
||||
try:
|
||||
output = subprocess.check_output(list_test_cmd,
|
||||
|
@ -114,7 +113,7 @@ class GoogleTest(TestFormat):
|
|||
testName = namePrefix + '/' + testName
|
||||
|
||||
cmd = [testPath, '--gtest_filter=' + testName]
|
||||
cmd = self.prepareCmd(cmd)
|
||||
cmd = self.maybeAddPythonToCmd(cmd)
|
||||
if litConfig.useValgrind:
|
||||
cmd = litConfig.valgrindArgs + cmd
|
||||
|
||||
|
@ -142,17 +141,13 @@ class GoogleTest(TestFormat):
|
|||
|
||||
return lit.Test.PASS,''
|
||||
|
||||
def prepareCmd(self, cmd):
|
||||
"""Insert interpreter if needed.
|
||||
def maybeAddPythonToCmd(self, cmd):
|
||||
"""Insert the python exe into the command if cmd[0] ends in .py
|
||||
|
||||
It inserts the python exe into the command if cmd[0] ends in .py or caller
|
||||
specified run_under.
|
||||
We cannot rely on the system to interpret shebang lines for us on
|
||||
Windows, so add the python executable to the command if this is a .py
|
||||
script.
|
||||
"""
|
||||
if cmd[0].endswith('.py'):
|
||||
cmd = [sys.executable] + cmd
|
||||
if self.run_under:
|
||||
cmd = self.run_under + cmd
|
||||
return [sys.executable] + cmd
|
||||
return cmd
|
||||
|
|
Loading…
Reference in New Issue