[llvm] d05ae0f - [debuginfo-tests] Fix environment variable used to specify LLDB
James Henderson via llvm-commits
llvm-commits at lists.llvm.org
Mon May 17 04:50:26 PDT 2021
Author: James Henderson
Date: 2021-05-17T12:50:10+01:00
New Revision: d05ae0fd1732507bcf5ad3dbd0ba2ca77f22f633
URL: https://github.com/llvm/llvm-project/commit/d05ae0fd1732507bcf5ad3dbd0ba2ca77f22f633
DIFF: https://github.com/llvm/llvm-project/commit/d05ae0fd1732507bcf5ad3dbd0ba2ca77f22f633.diff
LOG: [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
Added:
Modified:
debuginfo-tests/lit.cfg.py
llvm/utils/lit/lit/TestingConfig.py
Removed:
################################################################################
diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py
index 2de528ad63463..3ca6a67f02202 100644
--- a/debuginfo-tests/lit.cfg.py
+++ b/debuginfo-tests/lit.cfg.py
@@ -118,7 +118,7 @@ def can_target_host():
'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
diff --git a/llvm/utils/lit/lit/TestingConfig.py b/llvm/utils/lit/lit/TestingConfig.py
index e1d13aa3a0645..d534d895e4bae 100644
--- a/llvm/utils/lit/lit/TestingConfig.py
+++ b/llvm/utils/lit/lit/TestingConfig.py
@@ -22,12 +22,13 @@ def fromdefaults(litConfig):
}
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')
More information about the llvm-commits
mailing list