This is an archive of the discontinued LLVM Phabricator instance.

Differential D63679

[lit] Make lit-lldb-init configurable by CMake
ClosedPublic

Authored by JDevlieghere on Jun 21 2019, 4:00 PM.

Details

Reviewers
davide
stella.stamenova
sgraenitz
Commits
rG1c6fc7d70d42: [lit] Make lit-lldb-init configurable by CMake
rL364112: [lit] Make lit-lldb-init configurable by CMake
rLLDB364112: [lit] Make lit-lldb-init configurable by CMake
Summary

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.

Diff Detail

Repository
rL LLVM

Event Timeline

JDevlieghere created this revision.Jun 21 2019, 4:00 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 21 2019, 4:00 PM
Herald added subscribers: lldb-commits, mgorny. · View Herald Transcript
stella.stamenova accepted this revision.Jun 21 2019, 4:03 PM

LGTM.

This revision is now accepted and ready to land.Jun 21 2019, 4:03 PM
JDevlieghere updated this revision to Diff 206095.Jun 21 2019, 4:05 PM

Undo reformatting

davide accepted this revision.Jun 21 2019, 4:07 PM

LGTM.

Closed by commit rL364112: [lit] Make lit-lldb-init configurable by CMake (authored by JDevlieghere). · Explain WhyJun 21 2019, 4:12 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJun 21 2019, 4:12 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
lit/
4 lines
helper/
4 lines
3 lines
3 lines

Diff 206096

lldb/trunk/lit/CMakeLists.txt

Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Linesconfigure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
MAIN_CONFIG MAIN_CONFIG
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py) ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
configure_lit_site_cfg( configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg) ${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
if(NOT LLDB_BUILT_STANDALONE) if(NOT LLDB_BUILT_STANDALONE)
list(APPEND LLDB_TEST_DEPS list(APPEND LLDB_TEST_DEPS
FileCheck FileCheck
count count
not not
) )
endif() endif()
Show All 17 Lines

lldb/trunk/lit/helper/toolchain.py

Show All 32 Lines if config.lldb_tools_dir:
build_script_args.append('--tools-dir={0}'.format(config.lldb_tools_dir)) build_script_args.append('--tools-dir={0}'.format(config.lldb_tools_dir))
if config.llvm_libs_dir: if config.llvm_libs_dir:
build_script_args.append('--libs-dir={0}'.format(config.llvm_libs_dir)) build_script_args.append('--libs-dir={0}'.format(config.llvm_libs_dir))
primary_tools = [ primary_tools = [
ToolSubst('%lldb', ToolSubst('%lldb',
command=FindTool('lldb'), command=FindTool('lldb'),
extra_args=['--no-lldbinit', '-S', extra_args=['--no-lldbinit', '-S',
os.path.join(config.test_source_root, os.path.join(config.test_exec_root,
'lit-lldb-init')]), 'lit-lldb-init')]),
ToolSubst('%lldb-init', ToolSubst('%lldb-init',
command=FindTool('lldb'), command=FindTool('lldb'),
extra_args=['-S', extra_args=['-S',
os.path.join(config.test_source_root, os.path.join(config.test_exec_root,
'lit-lldb-init')]), 'lit-lldb-init')]),
lldbmi, lldbmi,
ToolSubst('%debugserver', ToolSubst('%debugserver',
command=FindTool(dsname), command=FindTool(dsname),
extra_args=dsargs, extra_args=dsargs,
unresolved='ignore'), unresolved='ignore'),
ToolSubst('%platformserver', ToolSubst('%platformserver',
command=FindTool('lldb-server'), command=FindTool('lldb-server'),
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines

lldb/trunk/lit/lit-lldb-init

# LLDB init file for the LIT tests.
settings set symbols.enable-external-lookup false
settings set interpreter.echo-comment-commands false

lldb/trunk/lit/lit-lldb-init.in

# LLDB init file for the LIT tests.
settings set symbols.enable-external-lookup false
settings set interpreter.echo-comment-commands false
lldb/trunk/lit/helper/toolchain.py