Skip to content

Commit d05ae0f

Browse files
committed
[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
1 parent 967f07f commit d05ae0f

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

debuginfo-tests/lit.cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def can_target_host():
118118
'debuginfo-tests project.'.format(config.host_triple))
119119

120120
# Check which debuggers are available:
121-
built_lldb = llvm_config.use_llvm_tool('lldb', search_env='CLANG')
121+
built_lldb = llvm_config.use_llvm_tool('lldb', search_env='LLDB')
122122
lldb_path = None
123123
if built_lldb is not None:
124124
lldb_path = built_lldb

llvm/utils/lit/lit/TestingConfig.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ def fromdefaults(litConfig):
2222
}
2323

2424
pass_vars = ['LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SYSTEMROOT', 'TERM',
25-
'CLANG', 'LD_PRELOAD', 'ASAN_OPTIONS', 'UBSAN_OPTIONS',
26-
'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL', 'SSH_AUTH_SOCK',
27-
'SANITIZER_IGNORE_CVE_2016_2143', 'TMPDIR', 'TMP', 'TEMP',
28-
'TEMPDIR', 'AVRLIT_BOARD', 'AVRLIT_PORT',
29-
'FILECHECK_OPTS', 'VCINSTALLDIR', 'VCToolsinstallDir',
30-
'VSINSTALLDIR', 'WindowsSdkDir', 'WindowsSDKLibVersion']
25+
'CLANG', 'LLDB', 'LD_PRELOAD', 'ASAN_OPTIONS',
26+
'UBSAN_OPTIONS', 'LSAN_OPTIONS', 'ADB', 'ANDROID_SERIAL',
27+
'SSH_AUTH_SOCK', 'SANITIZER_IGNORE_CVE_2016_2143',
28+
'TMPDIR', 'TMP', 'TEMP', 'TEMPDIR', 'AVRLIT_BOARD',
29+
'AVRLIT_PORT', 'FILECHECK_OPTS', 'VCINSTALLDIR',
30+
'VCToolsinstallDir', 'VSINSTALLDIR', 'WindowsSdkDir',
31+
'WindowsSDKLibVersion']
3132

3233
if sys.platform == 'win32':
3334
pass_vars.append('INCLUDE')

0 commit comments

Comments
 (0)