Skip to content

Commit 1c6fc7d

Browse files
committed
[lit] Make lit-lldb-init configurable by CMake
This makes the `lit-lldb-init` file configurable by CMake. This matters to us downstream in Swift, where we want to set environment variables with the `env` command for every test. Differential revision: https://reviews.llvm.org/D63679 llvm-svn: 364112
1 parent 592a193 commit 1c6fc7d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

lldb/lit/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ configure_lit_site_cfg(
8181
${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
8282
${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
8383

84+
configure_file(
85+
${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
86+
${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
87+
8488
if(NOT LLDB_BUILT_STANDALONE)
8589
list(APPEND LLDB_TEST_DEPS
8690
FileCheck

lldb/lit/helper/toolchain.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ def use_lldb_substitutions(config):
3838
ToolSubst('%lldb',
3939
command=FindTool('lldb'),
4040
extra_args=['--no-lldbinit', '-S',
41-
os.path.join(config.test_source_root,
41+
os.path.join(config.test_exec_root,
4242
'lit-lldb-init')]),
4343
ToolSubst('%lldb-init',
4444
command=FindTool('lldb'),
4545
extra_args=['-S',
46-
os.path.join(config.test_source_root,
46+
os.path.join(config.test_exec_root,
4747
'lit-lldb-init')]),
4848
lldbmi,
4949
ToolSubst('%debugserver',
File renamed without changes.

0 commit comments

Comments
 (0)