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

[debuginfo-tests] Fix environment variable used to specify LLDB 

Currently, if the user specifies the environment variable 'CLANG', tests
will attempt to use the value as a path to the clang executable.
Previously, lldb could also be specified via the CLANG environment
variable, but this was almost certainly a bug, because that meant both
clang and lldb would have the same path. This patch changes the
environment variable for lldb to 'LLDB'.

Reviewed by: thopre, teemperor

Differential Revision: https://reviews.llvm.org/D101982
This commit is contained in:
James Henderson 2021-05-06 09:44:36 +01:00
parent 967f07f547
commit d05ae0fd17
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debuginfo-tests/lit.cfg.py
View File

@ -118,7 +118,7 @@ else:
'debuginfo-tests project.'.format(config.host_triple))
# Check which debuggers are available:
built_lldb = llvm_config.use_llvm_tool('lldb', search_env='CLANG')
built_lldb = llvm_config.use_llvm_tool('lldb', search_env='LLDB')
lldb_path = None
if built_lldb is not None:
lldb_path = built_lldb

13
llvm/utils/lit/lit/TestingConfig.py
View File

@ -22,12 +22,13 @@ class TestingConfig(object):
}
pass_vars = ['LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SYSTEMROOT', 'TERM',
'CLANG', 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS',
'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL', 'SSH_AUTH_SOCK',
'SANITIZER_IGNORE_CVE_2016_2143', 'TMPDIR', 'TMP', 'TEMP',
'TEMPDIR', 'AVRLIT_BOARD', 'AVRLIT_PORT',
'FILECHECK_OPTS', 'VCINSTALLDIR', 'VCToolsinstallDir',
'VSINSTALLDIR', 'WindowsSdkDir', 'WindowsSDKLibVersion']
'CLANG', 'LLDB', 'LD_PRELOAD', 'ASAN_OPTIONS',
'UBSAN_OPTIONS', 'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL',
'SSH_AUTH_SOCK', 'SANITIZER_IGNORE_CVE_2016_2143',
'TMPDIR', 'TMP', 'TEMP', 'TEMPDIR', 'AVRLIT_BOARD',
'AVRLIT_PORT', 'FILECHECK_OPTS', 'VCINSTALLDIR',
'VCToolsinstallDir', 'VSINSTALLDIR', 'WindowsSdkDir',
'WindowsSDKLibVersion']
if sys.platform == 'win32':
pass_vars.append('INCLUDE')