maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[sanitizer-common] Force pickup of llvm-symbolizer from new binaries." 

This reverts commit 66ee0d3d84.

Broke the bots, reverting for full fix.
This commit is contained in:
Mitch Phillips 2020-12-17 16:09:43 -08:00
parent ab1a05d57f
commit 13261f4c03
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/test/sanitizer_common/lit.common.cfg.py
View File

@ -43,14 +43,6 @@ elif config.android:
# which does not work for abort()-terminated programs.
default_tool_options += ['abort_on_error=0']
# If the user has a poisoned *SAN_SYMBOLIZER_PATH (like what's setup by
# build/envsetup.sh on Android), then they can end up with an out-of-date
# symbolizer for the tests. Ensure they get the one from the recent build tree.
symbolizer_path="''"
if len(config.binary_path):
symbolizer_path = os.path.join(config.binary_path, "llvm-symbolizer")
default_tool_options += ['external_symbolizer_path=' + symbolizer_path]
default_tool_options_str = ':'.join(default_tool_options)
if default_tool_options_str:
config.environment[tool_options] = default_tool_options_str

1
compiler-rt/test/sanitizer_common/lit.site.cfg.py.in
View File

@ -5,7 +5,6 @@ config.name_suffix = "@CONFIG_NAME@"
config.tool_name = "@SANITIZER_COMMON_LIT_TEST_MODE@"
config.target_cflags = "@SANITIZER_COMMON_TEST_TARGET_CFLAGS@"
config.target_arch = "@SANITIZER_COMMON_TEST_TARGET_ARCH@"
config.binary_path = "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
# Load common config for all compiler-rt lit tests.
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")